Added KeyFinder

KeyFinder not working yet