Moving helper methods out into support/