Multithreading and quote handling
Merge conflicts