Have been looking at this but unclear on a few things and need to think about it a bit more. (before getting into the entitlement/product dirs, I'd like those to be singleton's but have to watchout for state)

If it's ok I'd like to postpone that and consider during the next batch of work or down the road so we can get merged and start building.