Almost done with instancing