Make repeated API call motions more generic
Make things more statically typed
Store InstanceId in driver