Added some basic shapes