Pulled some common features out of files so we are sure that parts match.