db working
mapping via intent - not yet