Change endtime when changing the startTime

Not sure why this branch has so many changes. Should I've started this branch from the milestone-hfmdk-systems-introduction branch?

Is this causing problems now?

Closes #1091 (closed)