Added more shapes.
Added output.