Transaction commented, loosely cleaned up.

Unresolved thought - should we really create a second itemfactory to get
items from? It doesn't seem like it.