Starting work on app-style templates

Too specific now, need to use more universal stuff