New KDR implementation, WIP