This should not be in the model.. let's see what we can do about that?