Completely implement packaging