Latest update fixes the compilation issues, with the last TODO item being the test... currently it passes but I haven't copied over the texture contents, so the results are kind of useless - if anyone has some spare cycles between now and tomorrow afternoon and is in a copypasting mood, feel free to throw a diff at me!