Time Select now works again

More code split apart