Initial checkin of new API implementation