Instance stuff
More instance stuff
Merge pull request #105 from Northcode/dev-Jens

Dev jens
Merge pull request #106 from Northcode/dev

Dev