fixed up some stuff around creation, basic refactor, and pulled in server code from old builds