Updating the app on my branch

This is so I can do work and we can have a working demo version.