refactor some ofthe grabbing