move logic to WorkMap and preserve most of the older WorkList unit tests