Almost done.  Only a weird timeData bug remains.