added rectangle and triangle to shapes