WIP on self-edges