WIP. Thrift tests still failing
WIP. Thrift tests still failing