Latest and greatest refactor exposing a simple interface
Merge in cfa2 changes