added shape class, changes in build