Implemented some REETODOs.  37 to go