add return fn for everything, server is not longer async :/