diff --git a/esx_e_radardetector/__resource.lua b/esx_e_radardetector/__resource.lua
new file mode 100644
index 0000000..16d6a24
--- /dev/null
+++ b/esx_e_radardetector/__resource.lua
@@ -0,0 +1,8 @@
+resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
+
+server_scripts {
+ '@mysql-async/lib/MySQL.lua',
+ 'server.lua'
+ }
+ 
+client_script 'client.lua'
diff --git a/esx_e_radardetector/client.lua b/esx_e_radardetector/client.lua
new file mode 100644
index 0000000..8579981
--- /dev/null
+++ b/esx_e_radardetector/client.lua
@@ -0,0 +1,119 @@
+
+ESX = nil
+local TutkaEnabled = false
+local blipsCops = {}
+local wasOn = false
+Citizen.CreateThread(function()
+	while ESX == nil do
+		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+		Citizen.Wait(0)
+	end
+	while ESX.GetPlayerData().job == nil do
+		Citizen.Wait(10)
+	end
+	PlayerData = ESX.GetPlayerData()
+end)
+
+RegisterNetEvent('tutka:ShowRadarBlip')
+AddEventHandler('tutka:ShowRadarBlip', function()
+	if IsPedInAnyVehicle(PlayerPedId(), false) then
+		TutkaEnabled = true
+		ESX.ShowNotification("Käynnistit tutkanpaljastimen")
+	elseif wasOn then
+		TutkaEnabled = false
+		wasOn = false
+		ESX.ShowNotification("Tutka ei nyt käynnisty automaattisesti")
+	else
+		ESX.ShowNotification("Et ole autossa")
+	end
+end)
+
+RegisterNetEvent('tutka:RemoveRadarBlip')
+AddEventHandler('tutka:RemoveRadarBlip', function()
+	ESX.ShowNotification("Sammutit tutkanpaljastimen")
+	TutkaEnabled = false
+	Citizen.Wait(1000)
+	for k, existingBlip in pairs(blipsCops) do
+		RemoveBlip(existingBlip)
+	end
+end)
+
+RegisterNetEvent('tutka:FRemoveRadarBlip')
+AddEventHandler('tutka:FRemoveRadarBlip', function()
+	TutkaEnabled = false
+	wasOn = false
+	Citizen.Wait(1000)
+	for k, existingBlip in pairs(blipsCops) do
+		RemoveBlip(existingBlip)
+	end
+end)
+
+function createBlip(id)
+	local ped = GetPlayerPed(id)
+	local blip = GetBlipFromEntity(ped)
+
+	if not DoesBlipExist(blip) then 
+		ESX.ShowNotification("Tutka havaittu lähettyvillä")
+		blip = AddBlipForEntity(ped)
+		SetBlipSprite(blip, 60)
+		ShowHeadingIndicatorOnBlip(blip, true) 
+		SetBlipScale(blip, 1.45) 
+		SetBlipAsShortRange(blip, true)
+		SetBlipFlashTimer(blip, 20000)
+		
+		table.insert(blipsCops, blip)
+	end
+end
+Citizen.CreateThread(function()
+	while true do
+		Citizen.Wait(500)
+		if IsPedInAnyVehicle(PlayerPedId(), false) and wasOn and not TutkaEnabled then
+			TutkaEnabled = true
+		end
+		if TutkaEnabled then
+			local playerPed = PlayerPedId()
+			if IsPedInAnyVehicle(PlayerPedId(), false) then
+				wasOn = false
+				ESX.TriggerServerCallback('esx_society:getOnlinePlayers', function(players)
+					for i=1, #players, 1 do
+						Citizen.Wait(10)
+						if players[i].job.name == 'police' then 
+							local id = GetPlayerFromServerId(players[i].source)
+							local ped = GetPlayerPed(id)
+							if NetworkIsPlayerActive(id) and ped ~= PlayerPedId() then
+								local coords    = GetEntityCoords(playerPed)
+								local coords2 	= GetEntityCoords(GetPlayerPed(id))
+								if GetDistanceBetweenCoords(coords, coords2,  true) < 400 then
+									local pveh = GetVehiclePedIsUsing(ped)
+									if GetVehicleClass(pveh) == 18 then
+										createBlip(id)
+									else
+										local blip = GetBlipFromEntity(ped)
+										if DoesBlipExist(blip) then 
+											RemoveBlip(blip)
+											ESX.ShowNotification("Lähettyvillä ollut tutka katosi")
+										end
+									end
+								else
+									local blip = GetBlipFromEntity(ped)
+									if DoesBlipExist(blip) then 
+										RemoveBlip(blip)
+										ESX.ShowNotification("Lähettyvillä ollut tutka katosi")
+									end
+								end
+							end
+						end
+					end
+				end)
+			else
+				wasOn = true
+				TriggerEvent("tutka:RemoveRadarBlip")
+			end
+		else
+			Citizen.Wait(5000)
+		end
+		if IsPedInAnyVehicle(PlayerPedId(), false) and wasOn and not TutkaEnabled then
+			TriggerEvent("tutka:ShowRadarBlip")
+		end
+	end
+end)
\ No newline at end of file
diff --git a/esx_e_radardetector/server.lua b/esx_e_radardetector/server.lua
new file mode 100644
index 0000000..a04b34a
--- /dev/null
+++ b/esx_e_radardetector/server.lua
@@ -0,0 +1,21 @@
+ESX = nil
+TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+
+local IsEnabled = false
+ESX.RegisterUsableItem('tutkanpaljastin', function(source)
+	if not IsEnabled then
+		IsEnabled  = true
+		TriggerClientEvent('tutka:ShowRadarBlip', source)
+	else
+		TriggerClientEvent('tutka:RemoveRadarBlip', source)
+		IsEnabled = false
+	end
+end)
+
+RegisterServerEvent('esx:onRemoveInventoryItem')
+AddEventHandler('esx:onRemoveInventoryItem', function(source, item, count)
+	if item.name ~= nil and item.name == 'tutkanpaljastin' and item.count == 0 then
+		IsEnabled = false
+		TriggerClientEvent('tutka:FRemoveRadarBlip', source)
+	end
+end)
\ No newline at end of file