Changes up to 8.12
Up to 8.16 - Getting ready for db migrate.
Changes up to 8.25
End of chp. 8 - Pre Cucumber refactor