Add grid
Create util.py, remove circular imports
Refactor