Wrapping up new time off refactor closes #1216.