Added more coroutines

also did some moving code bits as I muddle through what the API will be.