WIP: first pkg commit