Compiled and running now.
Revert "Added mapper object"

This reverts commit 5068966006ca2918f2f92c3e59eca5dc8ea7db77.
compiled and running now.
Merge branch 'Aaron'