Moving request form into using new structure.