Initial changes to make the app build & run