First attempt at mapper completion