working on making the package more general