Reformatting
Extracting grids and reformatting lesson
Part way through refactoring to new lesson format