Cleaned commented lines
Changes how we test for success in v1 of the API
Adds support for v2 of the API