Front end implementation v1
Fixed conflict on idex