Added file for rebase
Multithreading (continued) + cleanup