Some of the rfactored cde working