Mass Commit

Have not committed in a while.