Map and save checkbox

Story: https://www.pivotaltracker.com/story/show/66239494