added hw7 files... both functions done?