Fixing horrible deadlock
Flip paths
WIP: new api