Grid working

@katherinea