[WIP] Update server code to use catalog

It's working, just would like to add a test that runs a server as well.