Wip testing

It would be good to remove my now-outdated comment about my limited server budget :-)