It was so obvious I'll have to rebase this

Plus, I'll improve this as it is somewhat duplicated.
Some rebranding