Working on migrating more functionality into APIcalls.