Quite a lot has happened, probably should have committed earlier