HW11 stuff from class added