Start work on new bundles
Re-write container tests
More tests. Code refactoring