Added outline for toxav thread
Fixed conflicts