Week 5 almost finished, needs polish