Numerous changes, merging imminent
Added ability to play a card into a trick