Moved lots of stuff from webserver