Cleaner Version

This is the cleaner version of the project. I am currently working on
the user settings for the app.