WIP: build separate bundles