Effort is going slow, but its getting cleaner. Next step is to refactor move data... click handler is too reliant on state, need to be able to add data to a move and not seporate the move data.