working on app and templates