Settings mapping effort take 1 for help with #35