Updating Server

Everything should work as expected now. Integrated future features that
cannot yet be used client side.