Changing server architecture WIP