packaging additions, still experimental