~ refactorings work before we get more configurables messing up the structure