Extract is done. Now need to clean up on click logic.