Initial checkin, and updates to reflect API changes