Add in server and tweak it up