Add date

This integrates the Teacher changes so we have only one PR.

This closes #2