Thank you so much! It's my first module and I didn't really give myself enough time to think about the technical aspects of writing something system agnostic, so I imagine I've done it in a slightly peculiar way, but hopefully it is workable...