Added Shapes, Implementations and License