Initial changes

Includes changes from my fork to support taco_client.