Basically Just Finished the App
Merge master with my working copy. App is complete