Final code for second code review for week 2

I like this change and will implement on the next push in a second...