I'm aware that this logic is start to be a messy. and I like the idea to have a single ECHMv8 and I think it would not be too complicated to do it. however, I don't see what kind of value should be on the map. what is your idea? 

I don't like the idea of having two separate trackers :(