Merge branch 'new-backend'

Succesful integration of feature branch