Feature/api v2

Weird spacing here?  Looks odd in GitHub.