Added clock, time, and types to the mix.