[TASK] Fill in mapping logic and a few tests