Clean Up: Committing

Things I have not committed in a while.