Refactor

Moved addrMap from AddressSet to the atomicStack to keep track of
reactive vars