Updated Card.py to use card enum, and some new enums