WIP: bundles and environment config