Changed course & time objects to be dicts. Added & commented out db code.