aborted refactoring mapController... sigh