Removed individual cardtypes, replaced with Card model, still need to adjust front end for changes