Added what we talked about when we met

Turned Time class into takes property, fixed a few labels.