WIP: Fill detected pips