I like the checkpoint idea. Will keep it in mind for a separate ticket.