Backend master

Backend master is now up to date and ready to be merged into master