tested stuff
Merge branch 'backend' into alex-dev
because reasons