Added timer thread stuff; Still need to test