Week 12 - Monday - Post Generalisation Changes

Introduced changes to generalise code. Doesn't seem to have broken it.