I made good progress tonight, shall try and finish/edit tomorrow!