Issue: adding start/end dates