Level 2 cleanup and level 4 continued
Merge branch 'master' of https://github.com/olben/MankindsFinestHour