figuring out better packages
more moving, only parsially done