added classes - still altering to fit app