Thrift Sample Integration WIP