finished homework, fixed @autowired