Done the basic front
Merge branch 'feature/front_basic' into develop