Finished the overhaul to CAN