Stuff for the backend
Merge pull request #1 from crc442/backend-stuff

Stuff for the backend