Making this more of a package, slowly