I have moved it to a separate file, now it's the new object structure I'm not familiar with...