wip for server integration