Feature/new front end