scalability upgrades and expansions

Categorise