Initial push for new requestid lookup
Forgot to include classes.
Missed these.