New feature api

WIP