heatmapQuery: do things OOP. WIP
More OOP progress
Fixed a few minor bugs