Clock Stuff

So Tierno gave me access to this main branch thingy. This is clock, and
some formatting. No need for the pull request anymore.