Added shapes and namespacing, ooo