Final Official Commit

This is the version that was used for the official project demo.