Hacked around with the request routes - not tidy