kinda working, but i'm not really sure if it really is
Revert "kinda working, but i'm not really sure if it really is"

This reverts commit b18c7021c67442b5a02f9569becd333188b4d240.
Merge branch 'removing'
Revert "kinda working, but i'm not really sure if it really is"

This reverts commit b18c7021c67442b5a02f9569becd333188b4d240.
reverting with-heat-map branch changes