server and package
added a lot of stuff

doesn't quite seem to work though