Revert c868910..0b5a905

This rolls back to commit c86891044ea77ed15be4b0f0227364c30f125c32.
Revert dff3a2c..91239b2

This rolls back to commit dff3a2c55a3bb27960daf44a4838105c2934334b.
Program re-fixed

card pile, deck work