Work in progress. Adding fields specified in #12 to the app.