Request logic settings and improvements. Preparing to merge back to master