Alan

Merge in major progress on game play (still some shortfall and adjustments that need to be made)