Small renderer refactor
Add Clock