I already replaced the battery. I will look at the solenoid tomorrow, but the noise is kind of an erratic buzz and not a disengaged starter whir.