Some cleaning up and streamlining
Start testing of multithreading