Refactoring worked.
Got a lot of the refactoring done.