Added the draw triangle and rectangle code