Refactor config class 825

Fixes #825 
This flocker, not fig.