Done with Part B, Remove extra threading, Code to be cleaned up later