Don't merge yet - Fork web server

I'll break this into a few smaller PRs and rebase after each one is merged.