Added Rectangle and usingShapes, supposed to be V2 but is Version 3