Skillset done, grid refactored