Kind of a large commit, but finally got loading one program working again. phewh.