Converting to API Endpoint

See commit messages for details. :)