Updating TODO
Finishing off grid