Added Grid class.  Deprecated the Block class.