Added multithreaded capability
Committing pre-lab changes so I can pull them in during lab