Feature/time input

Closes #149