adds a couple mixins. reworks shape import statements. adds helpers.