Issue #7 - Implement Time Controller - polishing