RD|PM: refactor - complete. again. with rake updated.