Merge in some initial backend files

I want to keep master working (obviously). We should try to pull our working code from the respective branches into master or use a different git branch strategy.