First step in adding a mod container for instances.

WARNING: will squash.