Code compiles and links (branch debug). Time to merge back into master branch,
but keep working in debug.