Change rendering to function instead of redirecting to home
Cleaned up error handling in code
Add supprt for Time and Refactor
Refactor tests to clean up testing for more scenarios and add manual tests that failed