Added a lot of logging and am working on stopping splint parse errors. Ready to merge back into dev.