added proper Ace handling
removed card class