Added a bunch of stuff and server suppot etc etc.