MOAR stuff for webserver, needs module-based approach targeting refactor though