Late commit, lots of changes