WIP on instantiating the classes with a bundle.