Controls v2

Fixed .getShapes() error