more migration from todo pile to classes