Moving the naivety comparison into the actual weather object.  It just makes things a little cleaner