Started clean up from mass code infusion, things almost compile