Building mapping

Mapping not yet added to main VI.
Main VI is confirmed functional.