added in initial version of shape addition, needs work