Added first iteration of thrift integration
Merged