corrected class hierarchy
added some cards