Huge refactor

'Automatically declare stage instances' check, instances add