Really wishing there was a way to test this before push