Serial changes that don't compile.
Still no compilation but reduced to duplicate symbols.
Still issues with duplicate symbols.