commiting a mostly working server, no scripting yet