Grid refactor running

Score is broken