First pass at the resolver
First pass at the cellar manager