Added stuff, more commits, better messages