Handle all done a bit better - still buggy