Feature/new app