Finish Extra Cells Blocks

Fix #14