I'll spend a bit more on it, few things I might swap around in terms of how I'm handling resources but I'll try and put a PR together in the next week or so.