Refactoring Huge refactoring to address several issues that have been found in the v0.4.0 configurator. See merge request !48