refactor
grid and cell model