More work on turning server into a library