WIP: Continue server integration