Nearly there

Should be finished this some time tonight, so stay tuned