Auto 366 create check

Pulled out the MaaS stuff I was working on, so that we can get this merged.