Regression is starting to work pretty well. Refactoring & interface
changes to follow.