Interim checkin - converting the api data handling/filling/etc - moving off staging box to dev machine to run destructive tests.