Pushed things forward a bit more, still not got the visuals right