Add Keyfinder

Will be used eventually