Initial check in of pack-ified version.