Updated Grid to allow optional class output