Fixed paul's 5 server TODOs