Temp commit while I break everything for logging support.