Started modifying spreadsheet
Finish spreadsheet refactor.