WIP: Fixed server