WIP
WIP. Thrift Integration tests failing