Feature/server

The more hackish stuff, feel free to pull, or not ;)