Ah, yes, totally! This pull needs some refactoring.