Started implementation of server core components. Unsure on final structure at the minute, it may change.
Merge remote-tracking branch 'origin/master'