Starting to make it two different steps/screens to complete the report