Threading in both classes
if statement the wrong way around
Making the thread loop
Removing old code