Turned several of the Grid class back into java