Commit before going to bed - still several bugs