Add grid wrapper and tests