commit before some experimental checkouts
Working version: robust start, shared modules extracted, working scaling