WIP, work on bundle architecture