Feature/front end implementation