Moved some things around, colored more like moves.