Final Commit before Capstone Demo. Video's recorded using this build.