Prepping for Multithreading

796