Added more shapes and draw methods