Got the app working locally and cleaned up code
Fixing merge conflicts