Issue #945 Block 4 - Grid Editor