Wrapped boundary in an "enabled" attribute so we can roll it out to
staging/prod selectively.
Wrapped everything in an 'enabled' boolean so it can be enabled
piecemeal.