Lots of work - pretty close now