Still issues with time validation but closes #5