Bypassed troublesome link errors temporarily by commenting them out...

Perhaps I should have made a physical separation of branches instead of
doing it logically in Visual Studio...