Feature/backend

Merging the new backend into the development branch.