Feature/101

Fixes #101
Fixes #94

This might just move Curator into more data centers. :smile: