Lazy commit, added lots of stuff