Turn this into a package. Fixes #1