Added timestamps.
Cleaned out old code.