WIP server part 2