Now that #67 is done, @redbassett can start on this
Now that #67 is done, @redbassett can start on this