Added userlookup and removed some non async code