Updated now that I have a build system, some lingering issues.