Folding in some of the bits from "another cookbook"