progress, need to add regex