Test/refactor grid