Updated server code. Cleaned out unnecessary templating.