Mostly have the refactored code working, need to tweak new log system.