Bf/mapper

API Mapper baby!
good catch