Updated for HW4 removed previous HW3 stuff