week 7 software and refactor