Created & Completed HW7. Still full of bugs