stop times working. also some refactoring with the communication stuff