Interim commit, working on getting it to compile.