Last bits of instancing implementation

Really closes #286