Temporary commit, constructed layout for #12
Merge branch 'frontend_implementation' into Development