WIP: Almost have new instanced rendering in place