Rename function for clarity
Split out marathon as role
Add cachier