Wiring stuff together, TimeSelector improvements