Glad to move these to a utils module!