Basic package adding functionality. Fixes #12.