removed todo added search service
rename to pascal case
current step