Added more shapes and a random draw shapes function