Make cell a class with options
Fix up some bugs when converting to object