grid refactored & working