adding files i've modifed from the HW7 base