Move towards using a separate package to hold the guts of the boilerplate