Possible fix to the timeout method. Also beginning to implement the idle method.