Usually I'd save these for a later PR, but I'm happy to have them to work with, so no worries. :)