Work on package generation, untested