So many changes

Addition of some utility classes that will eventually be refactored to a
core plugin <3