WIP Edit pass

Returning -1 feels a bit like a magic number, can we change this requirement?