finished the overlap work (I hope)
WiP building heatmap algorithms TODO: figure out IndexOutOfBoundsExceptions
wip
Merge branch 'jonas-branch'