New files!

Server pieces
Merge remote-tracking branch 'origin/dev-dan'