Push more code down into utils