move some of the request handlers to their own module
Merging back in the old code
Fixed werid failing request issue