More additions to #1, remaining issues seem to be build-related