Config rewrite - I have yet to learn how to merge such branches

@nathanblaney You're good at this, think you could help out?