Shapes

There are still some errors and bugs.