Nearly Done

Just needs a bit of fine tuning.