Move clock stuff for now
Add comments