ongoing refactoring. Cadencii now builds.