condensed classes into one and added all card info