organize code / get rid of currentShape in ShapeMangger