Mass Commit

Haven't committed in a while.