WIP: Starting merging back changes made in a local version
Add a standalone options that can be used to exclude code when running a packaged version
Fix creation of containers through the convenience methods