Work on private tasks/products

This turned out to be more architecturally involved than I thought.