last commit of the day, need to finish grid