Working on making cells works.  About to push a commit back to master.