Iron out the bugs in the boilerplate