Final - works - fairly clean compile.
No plans to continue working on this branch.