Final week 2, everything working but not everything as desired