bigger TODO
added Grid object (bugged)