adding new effort data and full hex grid to analysis, requires some code restructuring