Continued work on item handler; mapper tangent.