Stuff is working, better commit