started on new app structure