The app is now working and showing the main page.
Working on geting it to build and deploy as well as showing the logo screen.
merging
Failing due to my own merge conflict