Lock Me Up And Throw Away The Key

My 1989 Jeep Cherokee scince I bought it has had a ignition switch problem. Seeings how I am fixing the beast I thought I might as well fix the ignition. My question is I can start the jeep with or without the key and I cannot switch it to accessory either. Is it the switch or the the tumbler?

if it turns without the key, then I believe the tumbler will need to be changed out.