More moving around, all tests passing, no cycles allowed.