Beginning of update for latest API changes

not yet functional - no testing integrated yet