Revert "petersj magic"

This reverts commit 4d02227681fcf98b1ef261bbe99fd28e85fdc6ee.
Stores mapposition between sessions
ensuring mapfragment gets location updates
counting receivers as a stop gap messures before more refactoring occurs ;)