added seach for user
Updated code for modular stuff