Forgot the actual new API file
Merge branch 'oo-fannie'