Simplified server provisioning

Not yet complete. Most TODOs are inline.

This will resolve #417.
I did this because there's a large net negative of code. I found that in order to keep the percentage at 79 I would have had to add coverage in unrelated parts of the code.