Working on #1

This pull request contains the work of @johnbacon and @soundslocke and me.