backend almost done
merage with front