This is fine for now, but let's flag this for refactoring on Monday, I think we can reduce some of the duplication here even further.