Half way through a massive refactoring. Turning works.