RD|PM: refactor - sort out todo's