Progress on modular boilerplate