Merge backend and master!

Backend branch is working, requesting merge with master branch!