Started moving things around in app to allow for a JSON powered app.