WIP: refaz td