Broken Commit for Syncing

Committing files so I can sync the branch, and pull steven's
recent commit.
Merging All Changes