fixup botched rebase
Merge branch 'ctr-lookback-2' of https://github.com/blackwhale/phobos into ctr-lookback-2
don't forget to add native code in the new API too