Merging in update to master for: cards, flipping cards, wells.