Another attempt at making this a package.