WIP. Still failing tests for Thrift