cleaned up and added more to the thread testing. Still figuring out how to complete it