Let's change this to not use threads.