finish up that chunk of the refactor
extract #completed-related stuff to a concern