Starting to add unit extraction