finishing out rough of game flow
finishing gameplay as I understand it. Need to figure out more about what happens when they stand
merging conflicT