first-pass packaging stuff from last week