WIP: Expanding component system