Brought the request upto scratch and factored some of the functions back
off