Auto 366 create check pass 2

Ignore the stuff from #17 - Review that first if you haven't already.