Commit All Uncommitted changes

Committing all 13 changes without review