user updates to support mapping
First mapping strategy!