Stripping down the toy course
Various additions. This is a work-in-progress commit.