[grid] refactored + shuffle around