Redid the multithreading so the program no longer waits a set amount of time.  Instead, the program waits until there are no more threads running.