Accomodating api changes, WIP.