WIP code base of v2 API development