Add some more of my utility classes in