Revert "Remove CellMapping and FormKit"

This reverts commit 8c37e99a9590808b5f22442f69852a77d1d06e65.