Start moving everything around...
Continue factorizing.
Fix some more States