Fixed Logic, added cards to specific subclasses