initial bundle structure, various things WIP