Yeah, I got a little muddled with this towards the end of the project. I was trying to find a balance between a role and implementation, but think I've made it unnecessarily complex. I'll move them over :)