More work on the boilerplate
Merge pull request #5 from gobrendan/boilerplate-setup

More work on the boilerplate