I pushed an updated version. This leaves us with the ":Time" in the error message. Should we `sub` that out to?