First crack at packagifying.