Mid week 5 commits

Mid week 5 code review.