Temp work, pkg creation broken