commented-out unused function and old mapping idea
Finished in-system mapping