My hope is that the refactoring today will pay me back over the next 6 months in saved time / stability