Just in case I find out I am on the wrong approach again, do an incremental check-in of current code changes.
Not quite building yet with latest changes but figured I'd check them in anyhow.