Added more shapes and made more complicated drawings