WIP - Week20

Draft of Week 20.. work in progress.