got first working version of mapper