This needs to be changed to handle Lockpicks and Probes too.