5 Commits (feat/base-partitioning-to-local)