Functonal webserver with supporting code changes. WIP COMMIT