Revert "Revert "Moving towards scalability""

This reverts commit 57175d409977feaf850fdb9dc2c3b2842266eebd.