first pass at supporting v2 api - some tests still fail (bugs reported on MC redmine)