Clock integration, refactor required