About to reduce complexity slightly (and fix bugs)