cleaned out old files and completed full functionality of HW7