Architected making moves, unable to test.
Merge fix.