First stab towards packaging