Finish v1 and v2 of the api, minor fix to v3