Beginning refactor of "claim"