Major changes - intermediate commit

Making changes to create general versions of the request block for
future use.