package things up correctly