let's start with one pkg and go from there
general improvements