draft attempts at adding server support