removed old templates
unfixed changes for grabbing request
fixed requests
merged changes