First working version of geometry reuse