Changed Cell type, and finished GridExpander.