New code! Adding new structure, factories, decorators, etc etc