moving mapper to settings rather than json file for easier user editing... also refactoring