Started to refashion the combinators to use the adapter registries etc.