lab7 complete
putting it together