Updated Classes to working code