7/24/2013 commit

Lots of changes, I've been bad.