Instance stuff
Revert
Revert "Revert"

This reverts commit e05692ca37edad16de42952c9a92768cf4b7af88.
Merge