Started work on long term framework for the app.