diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9adf5ba70..206e1f7ff0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -228,7 +228,7 @@ jobs:
       - run:
           name: Run cucumber
           command: |
-            sleep 5
+            sleep 10
             yarn cucumber:ci
       - store_artifacts:
           path: reports/
@@ -240,12 +240,12 @@ jobs:
       - run:
           name: Start up local server
           command: | # production style build (single BE server with static FE)
-            docker-compose -f docker-compose-test.yml run --rm server yarn install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn build
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend run build
-            docker-compose -f docker-compose-test.yml up -d
-            docker-compose -f docker-compose-test.yml exec server yarn db:migrate:ci
+            docker-compose -f docker-compose.dss.yml run --rm server yarn install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn build
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build
+            docker-compose -f docker-compose.dss.yml up -d
+            docker-compose -f docker-compose.dss.yml exec server yarn db:migrate:ci
       - run:
           name: Pull OWASP ZAP docker image
           command: docker pull owasp/zap2docker-weekly
diff --git a/bin/run-tests b/bin/run-tests
new file mode 100755
index 0000000000..a7c694c4d6
--- /dev/null
+++ b/bin/run-tests
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+declare -a options=(frontend backend)
+declare lr=">>>>>>>>"
+declare -i exit_code=0
+
+log() {
+    echo "$lr $*"
+}
+
+check_exit() {
+    if [[ "$1" -ne 0 ]]; then
+        echo "$lr last docker-compose command failed"
+        ((exit_code++))
+    fi
+}
+
+main() {
+    local opt=""
+
+    for o in "${options[@]}"; do
+        if [[ "${1}" == "$o"  ]]; then
+            opt="$o";
+        fi
+    done
+
+    log "Running tests in using test config 'docker-compose.test.yml'"
+    # Start containers
+    docker-compose -f 'docker-compose.test.yml' up -d
+    check_exit "$?"
+
+    # Let postgres initialize
+    echo
+    log "Giving postgres a few seconds to start up..."
+    sleep 5
+
+    # Migrate and seed db
+    echo
+    log "Migrating & seeding db"
+    docker exec test-backend bash -c "yarn db:migrate"
+    check_exit "$?"
+    docker exec test-backend bash -c "yarn db:seed;"
+    check_exit "$?"
+
+    if [[ "$opt" == "backend" || -z "$opt" ]]; then
+        # Test backend
+        echo
+        log "Running backend tests"
+        docker exec test-backend bash -c "yarn test:ci"
+        check_exit "$?"
+    fi
+
+    if [[ "$opt" == "frontend" || -z "$opt" ]]; then
+        # Test frontend
+        echo
+        log "Running frontend tests"
+        docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+        check_exit "$?"
+    fi
+
+    # Cleanup
+    echo
+    log "Cleaning up test containers"
+    docker-compose \
+        -f 'docker-compose.test.yml' \
+        down --volumes
+    check_exit "$?"
+
+    if [[ $exit_code -ne 0 ]]; then
+        echo
+        log "Errors occurred during script execution"
+    fi
+
+    exit "$exit_code"
+}
+
+main "$@"
diff --git a/docker-compose-test.yml b/docker-compose.dss.yml
similarity index 100%
rename from docker-compose-test.yml
rename to docker-compose.dss.yml
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000000..46d93e3edc
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,39 @@
+version: "3.5"
+services:
+  test-backend:
+    build:
+      context: .
+    container_name: test-backend
+    command: yarn server
+    user: ${CURRENT_USER:-root}
+    depends_on:
+      - test-db
+    environment:
+      - POSTGRES_HOST=test-db
+    volumes:
+      - ".:/app:rw"
+    networks:
+      - ttadp-test
+  test-frontend:
+    build:
+      context: .
+    container_name: test-frontend
+    command: yarn start
+    user: ${CURRENT_USER:-root}
+    stdin_open: true
+    volumes:
+      - "./frontend:/app:rw"
+      - "./scripts:/app/scripts"
+    environment:
+      - BACKEND_PROXY=http://test-backend:8080
+    networks:
+      - ttadp-test
+  test-db:
+    image: postgres:12.4
+    container_name: test-db
+    env_file: .env
+    networks:
+      - ttadp-test
+# Use non-default network so we don't conflict with the developer environment
+networks:
+  ttadp-test:
diff --git a/docs/logical_data_model.md b/docs/logical_data_model.md
index 8ba0a9b8f5..3f8880c41a 100644
--- a/docs/logical_data_model.md
+++ b/docs/logical_data_model.md
@@ -1,7 +1,7 @@
 Logical Data Model
 ==================
 
-<img src="http://www.plantuml.com/plantuml/png/nLVRRkCs47tNL_2jRO0OHOkYm29Ox6xgBV9GDqYo7p2M9Z9RYiCEHzaQSVwzffWAeYnd6QkNbmGwSpyyrCZll01BsvZ2bs1GVRluyOUY-4h10-bAEQQrmSQhpres2cnji58bqsUlxX6byBzhwu2XKKPRbAr3HImRAehIWFVgaqTMZuLIPqfNwetILh3UGnSNDLfa4ApUljsRDnvzyBqAJbvOstgFMcXm-EmsP77LDcla8Noci05jXf1eCVX6eMsRa9qQlC5QaxqQDF7rzzzzeswM7vStozNbybQvTcrqkOYEVg6hBdN96BfyB_j0qGrwWSPrbjPL4vQdlqUFUNA6FniDsgUuBSdXAHcKgj2Nh9reiZqwQvnhv4PxdprIwv4ps0w7tdFD9vwH3pnbX7Ly_XCd-qUBNfRCn3w73NBXGPCTdb3BUlZOe6meKJ_7CX-esgQmTsGz7iClgS8UdpaecIdvlIJPEtAwp8_foyIuB6KncPp33bdxivQG_ghwKapNnNo1_4nWyZXGoWj8wuT8I7ZF8pVjFp8rjmsm-0sYt0bS6mY2MXCP13klusxmbzgkzxOCqaEA_ujq1YkOgTVvbOxM6Q-dazzgTHmeX_Ne6GCF1TLj-9z0S3GeskeGdKrCa436HJvbm9IQtBWOTPA6Pt2n8XkxFcM1polzlXJze6LxWuvOSiepUcgvxBx1aXq4LQN3uWAp8i54LL7elzvV0uikjGjC9tUXGgCVaBU_76osgktNOOMbRi0aQWp39RBj8UWdsnVKQELkwt1YPuw_3m_lX6Eg6PeG7t1WXkr5j0P21BX6kIRNcgxJAHz6y6Gd32vbP6IEhyL9Wq2Svy1IaXNyKv81eCPRYUpyvicU_D5bmCkdAAWFst_vY-qvRBwq1wBBkrwGt8cCXjDB51j_rMidXjZ-DP0Hj-gTPnELjdz9ni2Q68Jul-BhjO8C8TFjvw-KkMsVi2cUsmuJgDtkd1vLb7f4dkZyVFSu-F5KnDzqXtYCcZAGwVsxJwMY-wkUTXqKUYYYQdgtVWyNuSy16bCk5Yhy7wISXcBHFji8YON3v7s9vr5IBEKv93ckq4ZToovVofVqUymKAHoPaxCScTB7n2Tv9qLUWdtQt5zqFExp3ctLDkOl">
+<img src="http://www.plantuml.com/plantuml/png/nLVRRkCs47tNL_2jRO0OHOkYm29Ox6xgBV9GDqYo7p2M9Z9RYiCEHzaQSVwzefaAeYnd6QkNbmGwSpyylBXuvmLOsiOKlWI3wjl5ZpyKnLSA7aXNoZ6j3JPUVTQoKM1hWvKgcJvxTOyeXVzTMmSCZJBQecmTAcBPK56K1hnNdpooUYoKEbDTjZTAMy6wWoukQhJ885YzVTkPDnvzyBqAJbvOsxf3BJGu_7ORihXgcpNo43vJs80sGqYq67oZqBPDo4uDtc2joLuDclZw----KJVBZykRvUfoUQjSkpQwN4H7lz3LFdN96BfyBrsWw0QzGEFsbjPL4vQdlqUFUNA6FniDsgUuBSdXAHcKgj2Nh9reiZqwQvnhv4PxdprIwv4ps0wBtdFD9wwH3pnbXEtv_2TMze-smvRCn3w73NBXGvCThb3BUlZPe6meKJ_7CX-esgQmTsGz7iClgS8UdpaecIdvlIJPEtAwp8_foyIuB6KncPp53bdxjPQG_ghwKio-Y_a2-Pd0v76Wb1UGrW-HaF2UHsxQVsHgRXjWyHj4kHEuDX04jIOo27PMnt7PNcgxxcmPf8SK_nVf35OmKw_pAnsjCxwUJZxLwZXG3klHCmQE11KHbfz0S3GeskeGdKrCa43EHZvXm9IQtBWOTPA6Pt2n8XkxFkK2drVwVIdwGSls1Xsnv9HdzDHokN-39NSGL9KMJHRCYWGJLKMX_tf_3Iowr2umdUo52er-GDx-Sd2pLMr_7LPOwWPCeiOmN2BR7e9-igwWHYjtMuSJT-RuVNYu9nnJpT24-803CsmleZKG8i0roZMvrkmxdV9X14zsmk0IHiRcU2nE6WJYF0UMagpWdv8C03NUIcJdDq-sWngm7SZfIfty63FWvLCKseVjl_oIUmwRB_c16FEs7IHx9QFXT7F5nbzr7CKGsnyF6N6htdasKMdxbsGCh8b1YFyhlbuho10otNx-LJEtxHDkaEUsmmHgjpkdHnMb7f4dEZ_VFGv-L1NnjzuX7gEc36Hw__qJgeXlwAVT7Wez554rlLj_FnVXpm4QKouMAlmVf9o6Oj4-smY9XSFaVOddKL8ivJaaEQxGIDsBBb_Cb_Hxp1Gf79cJjHoPqi_49pcJ8Y_1FcqUF1gE-hn3MxMD-Gi0">
 
 UML Source
 ----------
@@ -150,6 +150,7 @@ class ActivityReport {
   ttaType : array<string>
   context : string
   pageState : json
+  managerNotes : string
   * userId : integer(32) REFERENCES public.Users.id
   * lastUpdatedById : integer(32) REFERENCES public.Users.id
   * regionId : integer(32) REFERENCES public.Region.id
@@ -208,7 +209,7 @@ NonGrantee ||-{ ActivityParticipant
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/nLVRRkCs47tNL_2jRO0OHOkYm29Ox6xgBV9GDqYo7p2M9Z9RYiCEHzaQSVwzffWAeYnd6QkNbmGwSpyyrCZll01BsvZ2bs1GVRluyOUY-4h10-bAEQQrmSQhpres2cnji58bqsUlxX6byBzhwu2XKKPRbAr3HImRAehIWFVgaqTMZuLIPqfNwetILh3UGnSNDLfa4ApUljsRDnvzyBqAJbvOstgFMcXm-EmsP77LDcla8Noci05jXf1eCVX6eMsRa9qQlC5QaxqQDF7rzzzzeswM7vStozNbybQvTcrqkOYEVg6hBdN96BfyB_j0qGrwWSPrbjPL4vQdlqUFUNA6FniDsgUuBSdXAHcKgj2Nh9reiZqwQvnhv4PxdprIwv4ps0w7tdFD9vwH3pnbX7Ly_XCd-qUBNfRCn3w73NBXGPCTdb3BUlZOe6meKJ_7CX-esgQmTsGz7iClgS8UdpaecIdvlIJPEtAwp8_foyIuB6KncPp33bdxivQG_ghwKapNnNo1_4nWyZXGoWj8wuT8I7ZF8pVjFp8rjmsm-0sYt0bS6mY2MXCP13klusxmbzgkzxOCqaEA_ujq1YkOgTVvbOxM6Q-dazzgTHmeX_Ne6GCF1TLj-9z0S3GeskeGdKrCa436HJvbm9IQtBWOTPA6Pt2n8XkxFcM1polzlXJze6LxWuvOSiepUcgvxBx1aXq4LQN3uWAp8i54LL7elzvV0uikjGjC9tUXGgCVaBU_76osgktNOOMbRi0aQWp39RBj8UWdsnVKQELkwt1YPuw_3m_lX6Eg6PeG7t1WXkr5j0P21BX6kIRNcgxJAHz6y6Gd32vbP6IEhyL9Wq2Svy1IaXNyKv81eCPRYUpyvicU_D5bmCkdAAWFst_vY-qvRBwq1wBBkrwGt8cCXjDB51j_rMidXjZ-DP0Hj-gTPnELjdz9ni2Q68Jul-BhjO8C8TFjvw-KkMsVi2cUsmuJgDtkd1vLb7f4dkZyVFSu-F5KnDzqXtYCcZAGwVsxJwMY-wkUTXqKUYYYQdgtVWyNuSy16bCk5Yhy7wISXcBHFji8YON3v7s9vr5IBEKv93ckq4ZToovVofVqUymKAHoPaxCScTB7n2Tv9qLUWdtQt5zqFExp3ctLDkOl)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/png/nLVRRkCs47tNL_2jRO0OHOkYm29Ox6xgBV9GDqYo7p2M9Z9RYiCEHzaQSVwzefaAeYnd6QkNbmGwSpyylBXuvmLOsiOKlWI3wjl5ZpyKnLSA7aXNoZ6j3JPUVTQoKM1hWvKgcJvxTOyeXVzTMmSCZJBQecmTAcBPK56K1hnNdpooUYoKEbDTjZTAMy6wWoukQhJ885YzVTkPDnvzyBqAJbvOsxf3BJGu_7ORihXgcpNo43vJs80sGqYq67oZqBPDo4uDtc2joLuDclZw----KJVBZykRvUfoUQjSkpQwN4H7lz3LFdN96BfyBrsWw0QzGEFsbjPL4vQdlqUFUNA6FniDsgUuBSdXAHcKgj2Nh9reiZqwQvnhv4PxdprIwv4ps0wBtdFD9wwH3pnbXEtv_2TMze-smvRCn3w73NBXGvCThb3BUlZPe6meKJ_7CX-esgQmTsGz7iClgS8UdpaecIdvlIJPEtAwp8_foyIuB6KncPp53bdxjPQG_ghwKio-Y_a2-Pd0v76Wb1UGrW-HaF2UHsxQVsHgRXjWyHj4kHEuDX04jIOo27PMnt7PNcgxxcmPf8SK_nVf35OmKw_pAnsjCxwUJZxLwZXG3klHCmQE11KHbfz0S3GeskeGdKrCa43EHZvXm9IQtBWOTPA6Pt2n8XkxFkK2drVwVIdwGSls1Xsnv9HdzDHokN-39NSGL9KMJHRCYWGJLKMX_tf_3Iowr2umdUo52er-GDx-Sd2pLMr_7LPOwWPCeiOmN2BR7e9-igwWHYjtMuSJT-RuVNYu9nnJpT24-803CsmleZKG8i0roZMvrkmxdV9X14zsmk0IHiRcU2nE6WJYF0UMagpWdv8C03NUIcJdDq-sWngm7SZfIfty63FWvLCKseVjl_oIUmwRB_c16FEs7IHx9QFXT7F5nbzr7CKGsnyF6N6htdasKMdxbsGCh8b1YFyhlbuho10otNx-LJEtxHDkaEUsmmHgjpkdHnMb7f4dEZ_VFGv-L1NnjzuX7gEc36Hw__qJgeXlwAVT7Wez554rlLj_FnVXpm4QKouMAlmVf9o6Oj4-smY9XSFaVOddKL8ivJaaEQxGIDsBBb_Cb_Hxp1Gf79cJjHoPqi_49pcJ8Y_1FcqUF1gE-hn3MxMD-Gi0)
 2. Copy and paste the final UML into the UML Source section
 3. Update the img src and edit link target to the current values
 
diff --git a/docs/openapi/paths/activity-reports/review.yaml b/docs/openapi/paths/activity-reports/review.yaml
new file mode 100644
index 0000000000..0156f6d371
--- /dev/null
+++ b/docs/openapi/paths/activity-reports/review.yaml
@@ -0,0 +1,46 @@
+put:
+  tags:
+    - activity-reports
+  summary: Review an activity report
+  description: >
+    An approving manager reviews an activity report to determine if it requires
+    any additional updates. If the report needs updates the manager sets the status to
+    'Needs Action', otherwise to 'Approved'
+  requestBody:
+    description: The status and any manager notes
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            status:
+              type: string
+              description: The status of the report after review
+              enum:
+                - Approved
+                - Needs Action
+            managerNotes:
+              type: string
+              description: Any notes the manager needs to relay to the author/collaborators of the report
+  parameters:
+    - in: path
+      name: activityReportId
+      required: true
+      schema:
+        type: number
+  responses:
+    200:
+      description: The new status of the activity report
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              status:
+                type: string
+                enum:
+                 - Approved
+                 - Needs Action
+              managerNotes:
+                type: string
diff --git a/docs/openapi/paths/collaborators.yaml b/docs/openapi/paths/collaborators.yaml
index 8c0bd058a1..547f39767d 100644
--- a/docs/openapi/paths/collaborators.yaml
+++ b/docs/openapi/paths/collaborators.yaml
@@ -20,4 +20,4 @@ get:
           schema:
             type: array
             items:
-              $ref: '../../index.yaml#/components/schemas/selectableUser'
+              $ref: '../index.yaml#/components/schemas/selectableUser'
diff --git a/docs/openapi/paths/index.yaml b/docs/openapi/paths/index.yaml
index d3b0a8f797..af6eaf2bce 100644
--- a/docs/openapi/paths/index.yaml
+++ b/docs/openapi/paths/index.yaml
@@ -22,5 +22,7 @@
   $ref: './activity-reports/activity-reports-id.yaml'
 '/activity-reports/{activityReportId}/submit':
   $ref: './activity-reports/submit.yaml'
+'/activity-reports/{activityReportId}/review':
+  $ref: './activity-reports/review.yaml'
 '/files':
   $ref: './files.yaml'
diff --git a/docs/testing.md b/docs/testing.md
new file mode 100644
index 0000000000..5268d7fe57
--- /dev/null
+++ b/docs/testing.md
@@ -0,0 +1,48 @@
+# Testing
+
+## Tips and Caveats when writing tests
+
+
+### Handling async/promises
+
+When writing tests that rely on asynchronous operations, such as writing to the database, take care to make sure that those operations are resolved before any tests that rely on them run. If you need to create database records in a setup function such as `beforeAll`, you will want to make sure all async/promise operations resolve before subsequent tests run. You can make sure multiple await (promise) operations resolve by using [`Promise.all()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/all) (which takes an iterable of promises).
+
+Here's how that might look:
+
+```
+let a = someAsyncFun();
+let b = anotherAsyncFun();
+
+return Promise.all([a, b]);
+```
+
+### Creating/deleting database records
+
+Some tests will require interactions with the database, but at present all tests run using the same instance of the database. That means that any records you create or delete can potentially affect tests elsewhere. On top of that, tests run in parallel, so database operations may run in an unexpected order. That can mean tests may pass various times only to fail due to missing or unexpected records in the database when your tests run.
+
+To mitigate issues with missing or unexpected records causing failing tests, you can try a few approaches. One approach is to avoid using the database if your test doesn't actually require it. You may be able to use mock models or responses rather than interact with the database. If your test does require the database, you should create the records you need before your tests run and delete the records you created (and no others) when your tests finish. If you `Model.create`, make sure you `Model.destroy()` the records you created.
+
+When writing tests that create database records, it might also help to use a `try...catch` to catch errors in database transactions and log meaningful output. Sequelize error messages can be vague, and it might help others to see more informative messages.
+
+## Testing in Docker
+
+### Using `./bin/run-tests`
+
+To simplify running tests in Docker, there is a bash script, `./bin/run-tests` that will run the appropriate commands to start `test-` variations of the services used in tests. You should be able to run tests using that command while your development Docker environment is running. The script uses a separate `docker-compose.test.yml` which does not create a user-accessible network and cleans up after itself once tests have run.
+
+This script is written such that it will log errors, but won't exit if a docker command fails. It will count the number of errors and the number of errors will be the exit code (`$?`) for the script. So if three docker commands fail, the exit code would be 3.
+
+By default, `./bin/run-tests` will run both backend and frontend tests. If you want to run only one set of tests, supply 'frontend' or 'backend' as a parameter. So to run only the backend tests, you'd run `./bin/run-tests backend`.
+
+### Running tests in your development Docker environment
+
+When running tests in Docker, be aware that there are tests that will modify/delete database records. For tests to run, the 'db' service needs to exist and `db:migrate` and `db:seed` need to have been run (to create the tables and populate certain records).
+
+In the `docker-compose.yml` configuration, the database is set up to persist to a volume, "dbdata", so database records will persist between runs of the 'db' service, unless you remove that volume explicitly (e.g. `docker volume rm` or `docker-compose down --volumes`).
+
+
+### Notes on docker-compose and multiple configurations
+
+`docker-compose` has a feature for providing multiple `docker-compose.*.yml` files where subsequent files can override settings in previous files, which sounds like it would suit the use case of running docker for local development and for testing. However, the ability to [override configurations](https://docs.docker.com/compose/extends/#adding-and-overriding-configuration) is limited. While experimenting with overrides, it became clear that doing so would require a minimum of three docker-compose.yml files: one "base", one for local development, one for running tests. Trying to compose docker-compose.yml files would be complicated.
+
+In addition, while experimenting with multiple configuration files, it became clear that docker was unable to differentiate between different versions of the same service. Trying to override the 'db' service for testing would not work as expected: if the local/dev 'db' service had already been created, that one would be used when tests were run.
diff --git a/frontend/src/App.js b/frontend/src/App.js
index c992efaef2..f218439bcf 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -75,8 +75,8 @@ function App() {
         />
         <Route
           path="/activity-reports/:activityReportId/:currentPage?"
-          render={({ match }) => (
-            <ActivityReport match={match} />
+          render={({ match, location }) => (
+            <ActivityReport location={location} match={match} user={user} />
           )}
         />
         {admin
diff --git a/frontend/src/Constants.js b/frontend/src/Constants.js
index 9bc3f54ac6..df2b978d90 100644
--- a/frontend/src/Constants.js
+++ b/frontend/src/Constants.js
@@ -64,3 +64,5 @@ export const REGIONS = [
   11,
   12,
 ];
+
+export const DECIMAL_BASE = 10;
diff --git a/frontend/src/components/Navigator/__tests__/index.js b/frontend/src/components/Navigator/__tests__/index.js
index fde326316e..a11f34e5f7 100644
--- a/frontend/src/components/Navigator/__tests__/index.js
+++ b/frontend/src/components/Navigator/__tests__/index.js
@@ -42,7 +42,7 @@ const pages = [
     label: 'review page',
     path: 'review',
     review: true,
-    render: (hookForm, allComplete, formData, submitted, onSubmit) => (
+    render: (hookForm, allComplete, formData, onSubmit) => (
       <div>
         <button type="button" data-testid="review" onClick={onSubmit}>Continue</button>
       </div>
@@ -59,6 +59,9 @@ describe('Navigator', () => {
       <Navigator
         submitted={false}
         initialData={initialData}
+        status="draft"
+        onReview={() => {}}
+        approvingManager={false}
         defaultValues={{ first: '', second: '' }}
         pages={pages}
         currentPage={currentPage}
diff --git a/frontend/src/components/Navigator/components/SideNav.css b/frontend/src/components/Navigator/components/SideNav.css
index 685fc85f03..d917223677 100644
--- a/frontend/src/components/Navigator/components/SideNav.css
+++ b/frontend/src/components/Navigator/components/SideNav.css
@@ -49,8 +49,13 @@
   color: #f8f8f8;
 }
 
+.smart-hub--tag-needs-action {
+  background-color: #f9e0e4;
+  color: #d42240;
+}
+
 .smart-hub--tag {
-  width: 84px;
+  width: 94px;
   text-align: center;
   font-weight: normal;
   display: inline-block;
diff --git a/frontend/src/components/Navigator/components/SideNav.js b/frontend/src/components/Navigator/components/SideNav.js
index f1e172ff23..7de4990ba3 100644
--- a/frontend/src/components/Navigator/components/SideNav.js
+++ b/frontend/src/components/Navigator/components/SideNav.js
@@ -13,7 +13,7 @@ import moment from 'moment';
 import Container from '../../Container';
 import './SideNav.css';
 import {
-  NOT_STARTED, IN_PROGRESS, COMPLETE, SUBMITTED,
+  NOT_STARTED, IN_PROGRESS, COMPLETE, SUBMITTED, APPROVED, NEEDS_ACTION,
 } from '../constants';
 
 const tagClass = (state) => {
@@ -26,6 +26,10 @@ const tagClass = (state) => {
       return 'smart-hub--tag-complete';
     case SUBMITTED:
       return 'smart-hub--tag-submitted';
+    case APPROVED:
+      return 'smart-hub--tag-submitted';
+    case NEEDS_ACTION:
+      return 'smart-hub--tag-needs-action';
     default:
       return '';
   }
@@ -46,7 +50,7 @@ function SideNav({
       >
         <span className="margin-left-2">{page.label}</span>
         <span className="margin-left-auto margin-right-2">
-          {page.state
+          {page.state !== 'draft'
             && (
             <Tag className={`smart-hub--tag ${tagClass(page.state)}`}>
               {page.state}
diff --git a/frontend/src/components/Navigator/constants.js b/frontend/src/components/Navigator/constants.js
index 35cbee5d85..b644ef86cb 100644
--- a/frontend/src/components/Navigator/constants.js
+++ b/frontend/src/components/Navigator/constants.js
@@ -2,3 +2,5 @@ export const NOT_STARTED = 'Not started';
 export const IN_PROGRESS = 'In progress';
 export const COMPLETE = 'Complete';
 export const SUBMITTED = 'Submitted';
+export const APPROVED = 'Approved';
+export const NEEDS_ACTION = 'Needs Action';
diff --git a/frontend/src/components/Navigator/index.js b/frontend/src/components/Navigator/index.js
index a0cf8a44b0..a2ce7c76bb 100644
--- a/frontend/src/components/Navigator/index.js
+++ b/frontend/src/components/Navigator/index.js
@@ -15,29 +15,31 @@ import moment from 'moment';
 import Container from '../Container';
 
 import {
-  IN_PROGRESS, COMPLETE, SUBMITTED,
+  IN_PROGRESS, COMPLETE,
 } from './constants';
 import SideNav from './components/SideNav';
 import NavigatorHeader from './components/NavigatorHeader';
 
 function Navigator({
   initialData,
+  initialLastUpdated,
   pages,
   onFormSubmit,
-  submitted,
+  onReview,
   currentPage,
   additionalData,
   onSave,
   autoSaveInterval,
+  approvingManager,
+  status,
   reportId,
 }) {
   const [formData, updateFormData] = useState(initialData);
   const [errorMessage, updateErrorMessage] = useState();
-  const [lastSaveTime, updateLastSaveTime] = useState();
+  const [lastSaveTime, updateLastSaveTime] = useState(initialLastUpdated);
   const { pageState } = formData;
 
   const page = pages.find((p) => p.path === currentPage);
-  const submittedNavState = submitted ? SUBMITTED : null;
   const allComplete = _.every(pageState, (state) => state === COMPLETE);
 
   const hookForm = useForm({
@@ -76,8 +78,8 @@ function Navigator({
       const result = await onSave(data, newIndex);
       if (result) {
         updateLastSaveTime(moment());
+        updateErrorMessage();
       }
-      updateErrorMessage();
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);
@@ -102,7 +104,7 @@ function Navigator({
   const navigatorPages = pages.map((p) => {
     const current = p.position === page.position;
     const stateOfPage = current ? IN_PROGRESS : pageState[p.position];
-    const state = p.review ? submittedNavState : stateOfPage;
+    const state = p.review ? status : stateOfPage;
     return {
       label: p.label,
       onNavigation: () => onSaveForm(false, p.position),
@@ -129,9 +131,10 @@ function Navigator({
               hookForm,
               allComplete,
               formData,
-              submitted,
               onFormSubmit,
               additionalData,
+              onReview,
+              approvingManager,
               reportId,
             )}
           {!page.review
@@ -157,9 +160,12 @@ function Navigator({
 
 Navigator.propTypes = {
   initialData: PropTypes.shape({}),
+  initialLastUpdated: PropTypes.instanceOf(moment),
   onFormSubmit: PropTypes.func.isRequired,
-  submitted: PropTypes.bool.isRequired,
   onSave: PropTypes.func.isRequired,
+  status: PropTypes.string.isRequired,
+  onReview: PropTypes.func.isRequired,
+  approvingManager: PropTypes.bool.isRequired,
   pages: PropTypes.arrayOf(
     PropTypes.shape({
       review: PropTypes.bool.isRequired,
@@ -179,6 +185,7 @@ Navigator.defaultProps = {
   initialData: {},
   additionalData: {},
   autoSaveInterval: 1000 * 60 * 2,
+  initialLastUpdated: null,
 };
 
 export default Navigator;
diff --git a/frontend/src/fetchers/Admin.js b/frontend/src/fetchers/Admin.js
index 2ea28e313d..7897c8792e 100644
--- a/frontend/src/fetchers/Admin.js
+++ b/frontend/src/fetchers/Admin.js
@@ -1,5 +1,6 @@
 import join from 'url-join';
 import { get, put } from './index';
+import { DECIMAL_BASE } from '../Constants';
 
 export const getUsers = async () => {
   const users = await get((join('/', 'api', 'admin', 'users')));
@@ -7,6 +8,6 @@ export const getUsers = async () => {
 };
 
 export const updateUser = async (userId, data) => {
-  const user = await put((join('/', 'api', 'admin', 'users', userId.toString(10))), data);
+  const user = await put((join('/', 'api', 'admin', 'users', userId.toString(DECIMAL_BASE))), data);
   return user.json();
 };
diff --git a/frontend/src/fetchers/activityReports.js b/frontend/src/fetchers/activityReports.js
index 5e4e92f4b3..ace889f1c5 100644
--- a/frontend/src/fetchers/activityReports.js
+++ b/frontend/src/fetchers/activityReports.js
@@ -1,5 +1,6 @@
 import join from 'url-join';
 import { get, put, post } from './index';
+import { DECIMAL_BASE } from '../Constants';
 
 const activityReportUrl = join('/', 'api', 'activity-reports');
 
@@ -9,13 +10,13 @@ export const getApprovers = async (region) => {
 };
 
 export const submitReport = async (reportId, data) => {
-  const url = join(activityReportUrl, reportId.toString(10), 'submit');
+  const url = join(activityReportUrl, reportId.toString(DECIMAL_BASE), 'submit');
   const report = await post(url, data);
   return report.json();
 };
 
 export const saveReport = async (reportId, data) => {
-  const report = await put(join(activityReportUrl, reportId.toString(10)), data);
+  const report = await put(join(activityReportUrl, reportId.toString(DECIMAL_BASE)), data);
   return report.json();
 };
 
@@ -25,7 +26,7 @@ export const createReport = async (data) => {
 };
 
 export const getReport = async (reportId) => {
-  const report = await get(join(activityReportUrl, reportId.toString(10)));
+  const report = await get(join(activityReportUrl, reportId.toString(DECIMAL_BASE)));
   return report.json();
 };
 
@@ -39,3 +40,9 @@ export const getCollaborators = async (region) => {
   const collaborators = await get(url);
   return collaborators.json();
 };
+
+export const reviewReport = async (reportId, data) => {
+  const url = join(activityReportUrl, reportId.toString(DECIMAL_BASE), 'review');
+  const report = await put(url, data);
+  return report.json();
+};
diff --git a/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js b/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js
new file mode 100644
index 0000000000..96856aa8ec
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/ApproverReviewPage.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button,
+} from '@trussworks/react-uswds';
+
+const possibleStatus = [
+  'Approved',
+  'Needs Action',
+];
+
+const ApproverReviewPage = ({
+  reviewed,
+  additionalNotes,
+  register,
+  valid,
+  handleSubmit,
+  onFormReview,
+}) => (
+  <>
+    {reviewed
+      && (
+      <Alert noIcon className="margin-y-4" type="success">
+        <b>Success</b>
+        <br />
+        Your review of this report was successfully submitted
+      </Alert>
+      )}
+    <h2>Review and approve report</h2>
+    <div className="smart-hub--creator-notes">
+      <p>
+        <span className="text-bold">Creator notes</span>
+        <br />
+        <br />
+        { additionalNotes || 'No creator notes' }
+      </p>
+    </div>
+    <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormReview)}>
+      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+        <Label htmlFor="managerNotes">Manager notes</Label>
+        <Textarea inputRef={register} id="managerNotes" name="managerNotes" />
+      </Fieldset>
+      <Label htmlFor="status">Choose report status</Label>
+      <Dropdown id="status" name="status" defaultValue="" inputRef={register({ required: true })}>
+        <option name="default" value="" disabled hidden>- Select -</option>
+        {possibleStatus.map((status) => (
+          <option key={status} value={status}>{status}</option>
+        ))}
+      </Dropdown>
+      <Button type="submit" disabled={!valid}>Submit</Button>
+    </Form>
+  </>
+);
+
+ApproverReviewPage.propTypes = {
+  reviewed: PropTypes.bool.isRequired,
+  additionalNotes: PropTypes.string.isRequired,
+  register: PropTypes.func.isRequired,
+  valid: PropTypes.bool.isRequired,
+  handleSubmit: PropTypes.func.isRequired,
+  onFormReview: PropTypes.func.isRequired,
+};
+
+export default ApproverReviewPage;
diff --git a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css
new file mode 100644
index 0000000000..82dbcd2e28
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.css
@@ -0,0 +1,8 @@
+.smart-hub--creator-notes {
+  padding: 1rem;
+  background-color: #f8f8f8;
+}
+
+#status {
+  max-width: 270px;
+}
diff --git a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
index 6670b9f252..68a9974ff8 100644
--- a/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
@@ -1,28 +1,54 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
-  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button, Accordion,
+  Alert, Accordion,
 } from '@trussworks/react-uswds';
 import { Helmet } from 'react-helmet';
 
 import Container from '../../../components/Container';
+import SubmitterReviewPage from './SubmitterReviewPage';
+import ApproverReviewPage from './ApproverReviewPage';
+import './ReviewSubmit.css';
 
 const ReviewSubmit = ({
-  hookForm, allComplete, onSubmit, submitted, reviewItems, approvers,
+  hookForm,
+  allComplete,
+  onSubmit,
+  onReview,
+  reviewItems,
+  approvers,
+  approvingManager,
+  initialData,
 }) => {
   const { handleSubmit, register, formState } = hookForm;
+  const { additionalNotes } = initialData;
   const { isValid } = formState;
   const valid = allComplete && isValid;
 
-  const onFormSubmit = (data) => {
-    onSubmit(data);
+  const [submitted, updateSubmitted] = useState(false);
+  const [reviewed, updateReviewed] = useState(false);
+  const [error, updateError] = useState();
+
+  const onFormSubmit = async (data) => {
+    try {
+      await onSubmit(data);
+      updateSubmitted(true);
+      updateError();
+    } catch (e) {
+      updateSubmitted(false);
+      updateError('Unable to submit report');
+    }
   };
 
-  const setValue = (e) => {
-    if (e === '') {
-      return null;
+  const onFormReview = async (data) => {
+    try {
+      await onReview(data);
+      updateReviewed(true);
+      updateError();
+    } catch (e) {
+      updateReviewed(false);
+      updateError('Unable to review report');
     }
-    return parseInt(e, 10);
   };
 
   return (
@@ -32,44 +58,36 @@ const ReviewSubmit = ({
       </Helmet>
       <Accordion bordered={false} items={reviewItems} />
       <Container skipTopPadding className="margin-top-2 padding-top-2">
-        <h3>Submit Report</h3>
-        {submitted
-        && (
-        <Alert noIcon className="margin-y-4" type="success">
-          <b>Success</b>
+        {error && (
+        <Alert noIcon className="margin-y-4" type="error">
+          <b>Error</b>
           <br />
-          This report was successfully submitted for approval
+          {error}
         </Alert>
         )}
-        {!allComplete
+        {!approvingManager
         && (
-        <Alert noIcon className="margin-y-4" type="error">
-          <b>Incomplete report</b>
-          <br />
-          This report cannot be submitted until all sections are complete
-        </Alert>
+        <SubmitterReviewPage
+          submitted={submitted}
+          allComplete={allComplete}
+          register={register}
+          approvers={approvers}
+          valid={valid}
+          handleSubmit={handleSubmit}
+          onFormSubmit={onFormSubmit}
+        />
+        )}
+        {approvingManager
+        && (
+        <ApproverReviewPage
+          reviewed={reviewed}
+          additionalNotes={additionalNotes}
+          register={register}
+          valid={valid}
+          handleSubmit={handleSubmit}
+          onFormReview={onFormReview}
+        />
         )}
-        <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
-          <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
-            <Label htmlFor="additionalNotes">Creator notes</Label>
-            <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
-          </Fieldset>
-          <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
-            <p className="margin-top-4">
-              Submitting this form for approval means that you will no longer be in draft mode.
-              Please review all information in each section before submitting to your manager for
-              approval.
-            </p>
-            <Label htmlFor="approvingManagerId">Approving manager</Label>
-            <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
-              <option name="default" value="" disabled hidden>Select a Manager...</option>
-              {approvers.map((approver) => (
-                <option key={approver.id} value={approver.id}>{approver.name}</option>
-              ))}
-            </Dropdown>
-          </Fieldset>
-          <Button type="submit" disabled={!valid}>Submit for approval</Button>
-        </Form>
       </Container>
     </>
   );
@@ -84,7 +102,11 @@ ReviewSubmit.propTypes = {
   ).isRequired,
   allComplete: PropTypes.bool.isRequired,
   onSubmit: PropTypes.func.isRequired,
-  submitted: PropTypes.bool.isRequired,
+  onReview: PropTypes.func.isRequired,
+  approvingManager: PropTypes.bool.isRequired,
+  initialData: PropTypes.shape({
+    additionalNotes: PropTypes.string,
+  }).isRequired,
   // eslint-disable-next-line react/forbid-prop-types
   hookForm: PropTypes.object.isRequired,
   reviewItems: PropTypes.arrayOf(
diff --git a/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js b/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js
new file mode 100644
index 0000000000..62cf6e7609
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/SubmitterReviewPage.js
@@ -0,0 +1,82 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import {
+  Dropdown, Form, Label, Fieldset, Textarea, Alert, Button,
+} from '@trussworks/react-uswds';
+
+import { DECIMAL_BASE } from '../../../Constants';
+
+const SubmitterReviewPage = ({
+  submitted,
+  allComplete,
+  register,
+  approvers,
+  valid,
+  handleSubmit,
+  onFormSubmit,
+}) => {
+  const setValue = (e) => {
+    if (e === '') {
+      return null;
+    }
+    return parseInt(e, DECIMAL_BASE);
+  };
+  return (
+    <>
+      {submitted
+  && (
+  <Alert noIcon className="margin-y-4" type="success">
+    <b>Success</b>
+    <br />
+    This report was successfully submitted for approval
+  </Alert>
+  )}
+      {!allComplete
+  && (
+  <Alert noIcon className="margin-y-4" type="error">
+    <b>Incomplete report</b>
+    <br />
+    This report cannot be submitted until all sections are complete
+  </Alert>
+  )}
+      <h2>Submit Report</h2>
+      <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}>
+        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
+          <Label htmlFor="additionalNotes">Creator notes</Label>
+          <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" />
+        </Fieldset>
+        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+          <p className="margin-top-4">
+            Submitting this form for approval means that you will no longer be in draft
+            mode. Please review all information in each section before submitting to your
+            manager for approval.
+          </p>
+          <Label htmlFor="approvingManagerId">Approving manager</Label>
+          <Dropdown id="approvingManagerId" name="approvingManagerId" inputRef={register({ setValueAs: setValue, required: true })}>
+            <option name="default" value="" disabled hidden>Select a Manager...</option>
+            {approvers.map((approver) => (
+              <option key={approver.id} value={approver.id}>{approver.name}</option>
+            ))}
+          </Dropdown>
+        </Fieldset>
+        <Button type="submit" disabled={!valid}>Submit for approval</Button>
+      </Form>
+    </>
+  );
+};
+
+SubmitterReviewPage.propTypes = {
+  submitted: PropTypes.bool.isRequired,
+  allComplete: PropTypes.bool.isRequired,
+  register: PropTypes.func.isRequired,
+  approvers: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })).isRequired,
+  valid: PropTypes.bool.isRequired,
+  handleSubmit: PropTypes.func.isRequired,
+  onFormSubmit: PropTypes.func.isRequired,
+};
+
+export default SubmitterReviewPage;
diff --git a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
index d6f97d10b2..5e0a31baaf 100644
--- a/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
+++ b/frontend/src/pages/ActivityReport/Pages/__tests__/ReviewSubmit.js
@@ -13,31 +13,42 @@ const approvers = [
 
 const RenderReview = ({
   // eslint-disable-next-line react/prop-types
-  allComplete, submitted, initialData, onSubmit,
+  allComplete, initialData, onSubmit, onReview, approvingManagerId, approvingManager,
 }) => {
   const hookForm = useForm({
     mode: 'onChange',
-    defaultValues: { ...initialData, approvingManagerId: null },
+    defaultValues: { ...initialData, approvingManagerId },
   });
   return (
     <ReviewSubmit
       allComplete={allComplete}
-      submitted={submitted}
       onSubmit={onSubmit}
       reviewItems={[]}
       approvers={approvers}
       hookForm={hookForm}
+      initialData={initialData}
+      onReview={onReview}
+      approvingManager={approvingManager}
     />
   );
 };
 
-const renderReview = (allComplete, submitted, initialData = {}, onSubmit = () => {}) => {
+const renderReview = (
+  allComplete,
+  approvingManager = false,
+  initialData = { additionalNotes: '' },
+  onSubmit = () => {},
+  onReview = () => {},
+  approvingManagerId = null,
+) => {
   render(
     <RenderReview
       allComplete={allComplete}
-      submitted={submitted}
       onSubmit={onSubmit}
       initialData={initialData}
+      approvingManager={approvingManager}
+      onReview={onReview}
+      approvingManagerId={approvingManagerId}
     />,
   );
 };
@@ -45,6 +56,35 @@ const renderReview = (allComplete, submitted, initialData = {}, onSubmit = () =>
 const selectLabel = 'Approving manager';
 
 describe('ReviewSubmit', () => {
+  describe('when the user is the approving manager', () => {
+    it('shows the manager UI', async () => {
+      renderReview(true, true);
+      const header = await screen.findByText('Review and approve report');
+      expect(header).toBeVisible();
+    });
+
+    it('allows the manager to review the report', async () => {
+      const onReview = jest.fn();
+      renderReview(true, true, { additionalNotes: '', status: 'Approved' }, () => {}, onReview);
+      const reviewButton = await screen.findByRole('button');
+      userEvent.click(reviewButton);
+      await waitFor(() => expect(onReview).toHaveBeenCalled());
+    });
+
+    it('the review button handles errors', async () => {
+      const onReview = jest.fn();
+      onReview.mockImplementation(() => {
+        throw new Error();
+      });
+
+      renderReview(true, true, { additionalNotes: '', status: 'Approved' }, () => {}, onReview);
+      const reviewButton = await screen.findByRole('button');
+      userEvent.click(reviewButton);
+      const error = await screen.findByTestId('alert');
+      expect(error).toHaveTextContent('Unable to review report');
+    });
+  });
+
   describe('when the form is not complete', () => {
     it('an error alert is shown', async () => {
       renderReview(false, false);
@@ -76,16 +116,40 @@ describe('ReviewSubmit', () => {
       userEvent.selectOptions(screen.getByTestId('dropdown'), ['1']);
       expect(await screen.findByRole('button')).toBeEnabled();
     });
+
+    it('the submit button calls onSubmit', async () => {
+      const onSubmit = jest.fn();
+      renderReview(true, false, {}, onSubmit, () => {}, 1);
+      const button = await screen.findByRole('button');
+      expect(button).toBeEnabled();
+      userEvent.click(button);
+      await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+    });
+
+    it('the submit button handles errors', async () => {
+      const onSubmit = jest.fn();
+      onSubmit.mockImplementation(() => {
+        throw new Error();
+      });
+
+      renderReview(true, false, {}, onSubmit, () => {}, 1);
+      const button = await screen.findByRole('button');
+      expect(button).toBeEnabled();
+      userEvent.click(button);
+      const error = await screen.findByTestId('alert');
+      expect(error).toHaveTextContent('Unable to submit report');
+    });
   });
 
   it('a success modal is shown once submitted', async () => {
-    renderReview(true, true);
+    renderReview(true, false, {}, () => {}, () => {}, 1);
+    userEvent.click(await screen.findByTestId('button'));
     const alert = await screen.findByTestId('alert');
     expect(alert).toHaveClass('usa-alert--success');
   });
 
   it('initializes the form with "initialData"', async () => {
-    renderReview(true, true, { additionalNotes: 'test' });
+    renderReview(true, false, { additionalNotes: 'test' });
     const textBox = await screen.findByLabelText('Creator notes');
     await waitFor(() => expect(textBox).toHaveValue('test'));
   });
diff --git a/frontend/src/pages/ActivityReport/Pages/index.js b/frontend/src/pages/ActivityReport/Pages/index.js
index eaf5e5533b..b8907e27c6 100644
--- a/frontend/src/pages/ActivityReport/Pages/index.js
+++ b/frontend/src/pages/ActivityReport/Pages/index.js
@@ -26,19 +26,29 @@ const reviewPage = {
   review: true,
   label: 'Review and submit',
   path: 'review',
-  render: (hookForm, allComplete, formData, submitted, onSubmit, additionalData) => (
-    <ReviewSubmit
-      approvers={additionalData.approvers}
-      allComplete={allComplete}
-      onSubmit={onSubmit}
-      submitted={submitted}
-      hookForm={hookForm}
-      reviewItems={
-        pages.map((p) => reviewItem(p.path, p.label, p.sections, formData))
-      }
-      initialData={formData}
-    />
-  ),
+  render:
+    (
+      hookForm,
+      allComplete,
+      formData,
+      onSubmit,
+      additionalData,
+      onReview,
+      approvingManager,
+    ) => (
+      <ReviewSubmit
+        approvers={additionalData.approvers}
+        allComplete={allComplete}
+        onSubmit={onSubmit}
+        onReview={onReview}
+        hookForm={hookForm}
+        approvingManager={approvingManager}
+        reviewItems={
+          pages.map((p) => reviewItem(p.path, p.label, p.sections, formData))
+        }
+        initialData={formData}
+      />
+    ),
 };
 
 export default [...pages, reviewPage];
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index b68a17b4bc..690c3d6d3a 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -35,14 +35,19 @@ const formData = () => ({
   startDate: moment().format('MM/DD/YYYY'),
   targetPopulations: ['target 1'],
   topics: 'first',
+  updatedAt: new Date().toISOString(),
 });
 const history = createMemoryHistory();
 
-const renderActivityReport = (id, location = 'activity-summary') => {
+const renderActivityReport = (id, location = 'activity-summary', showLastUpdatedTime = null) => {
   render(
     <Router history={history}>
       <ActivityReport
         match={{ params: { currentPage: location, activityReportId: id }, path: '', url: '' }}
+        location={{
+          state: { showLastUpdatedTime }, hash: '', pathname: '', search: '',
+        }}
+        user={{ id: 1 }}
       />
     </Router>,
   );
@@ -62,6 +67,24 @@ describe('ActivityReport', () => {
     fetchMock.get('/api/activity-reports/approvers?region=1', []);
   });
 
+  describe('last saved time', () => {
+    it('is shown if history.state.showLastUpdatedTime is true', async () => {
+      const data = formData();
+      fetchMock.get('/api/activity-reports/1', data);
+      renderActivityReport('1', 'activity-summary', true);
+      await screen.findByRole('group', { name: 'Who was the activity for?' });
+      expect(await screen.findByTestId('alert')).toBeVisible();
+    });
+
+    it('is not shown if history.state.showLastUpdatedTime is null', async () => {
+      const data = formData();
+      fetchMock.get('/api/activity-reports/1', data);
+      renderActivityReport('1', 'activity-summary');
+      await screen.findByRole('group', { name: 'Who was the activity for?' });
+      expect(screen.queryByTestId('alert')).toBeNull();
+    });
+  });
+
   it('defaults to activity summary if no page is in the url', async () => {
     renderActivityReport('new', null);
     await waitFor(() => expect(history.location.pathname).toEqual('/activity-reports/new/activity-summary'));
diff --git a/frontend/src/pages/ActivityReport/index.js b/frontend/src/pages/ActivityReport/index.js
index 34feb5c0e4..ef1b785c0b 100644
--- a/frontend/src/pages/ActivityReport/index.js
+++ b/frontend/src/pages/ActivityReport/index.js
@@ -3,11 +3,13 @@
   multiple pages. Each "page" is defined in the `./Pages` directory.
 */
 import React, { useState, useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Helmet } from 'react-helmet';
 import ReactRouterPropTypes from 'react-router-prop-types';
 import { useHistory, Redirect } from 'react-router-dom';
 import { Alert } from '@trussworks/react-uswds';
+import moment from 'moment';
 
 import pages from './Pages';
 import Navigator from '../../components/Navigator';
@@ -22,6 +24,7 @@ import {
   createReport,
   getCollaborators,
   getApprovers,
+  reviewReport,
 } from '../../fetchers/activityReports';
 
 // All new reports will show these two goals
@@ -63,16 +66,27 @@ const region = 1;
 const pagesByPos = _.keyBy(pages.filter((p) => !p.review), (page) => page.position);
 const defaultPageState = _.mapValues(pagesByPos, () => NOT_STARTED);
 
-function ActivityReport({ match }) {
+function ActivityReport({ match, user, location }) {
   const { params: { currentPage, activityReportId } } = match;
   const history = useHistory();
-  const [submitted, updateSubmitted] = useState();
+  const [status, updateStatus] = useState();
   const [error, updateError] = useState();
   const [loading, updateLoading] = useState(true);
   const [initialFormData, updateInitialFormData] = useState(defaultValues);
   const [initialAdditionalData, updateAdditionalData] = useState({});
+  const [approvingManager, updateApprovingManager] = useState(false);
+  const [canWrite, updateCanWrite] = useState(false);
+  const [initialLastUpdated, updateInitialLastUpdated] = useState();
   const reportId = useRef();
 
+  const showLastUpdatedTime = (location.state && location.state.showLastUpdatedTime) || false;
+
+  useEffect(() => {
+    // Clear history state once mounted and activityReportId changes. This prevents someone from
+    // seeing a save message if they refresh the page after creating a new report.
+    history.replace();
+  }, [activityReportId, history]);
+
   useEffect(() => {
     const fetch = async () => {
       try {
@@ -87,15 +101,30 @@ function ActivityReport({ match }) {
         if (activityReportId !== 'new') {
           apiCalls.push(getReport(activityReportId));
         } else {
-          apiCalls.push(Promise.resolve({ ...defaultValues, pageState: defaultPageState }));
+          apiCalls.push(
+            Promise.resolve({ ...defaultValues, pageState: defaultPageState, userId: user.id }),
+          );
         }
 
         const [recipients, collaborators, approvers, report] = await Promise.all(apiCalls);
 
         reportId.current = activityReportId;
+
+        const isCollaborator = report.collaborators
+          && report.collaborators.find((u) => u.id === user.id);
+        const isAuthor = report.userId === user.id;
+        const canWriteReport = isCollaborator || isAuthor;
+
         updateAdditionalData({ recipients, collaborators, approvers });
         updateInitialFormData(report);
-        updateSubmitted(report.status === 'submitted');
+        updateStatus(report.status || 'draft');
+        updateApprovingManager(report.approvingManagerId === user.id);
+        updateCanWrite(canWriteReport);
+
+        if (showLastUpdatedTime) {
+          updateInitialLastUpdated(moment(report.updatedAt));
+        }
+
         updateError();
       } catch (e) {
         updateError('Unable to load activity report');
@@ -104,7 +133,7 @@ function ActivityReport({ match }) {
       }
     };
     fetch();
-  }, [activityReportId]);
+  }, [activityReportId, user.id, showLastUpdatedTime]);
 
   if (loading) {
     return (
@@ -130,32 +159,43 @@ function ActivityReport({ match }) {
 
   const updatePage = (position) => {
     const page = pages.find((p) => p.position === position);
-    history.push(`/activity-reports/${reportId.current}/${page.path}`);
+    const state = {};
+    if (activityReportId === 'new' && reportId.current !== 'new') {
+      state.showLastUpdatedTime = true;
+    }
+    history.replace(`/activity-reports/${reportId.current}/${page.path}`, state);
   };
 
   const onSave = async (data, newIndex) => {
     const { activityRecipientType, activityRecipients } = data;
-    let saved = false;
-    if (reportId.current === 'new') {
-      if (activityRecipientType && activityRecipients && activityRecipients.length > 0) {
-        const savedReport = await createReport({ ...data, regionId: region }, {});
-        reportId.current = savedReport.id;
-        saved = true;
+    let updatedReport = false;
+    if (canWrite) {
+      if (reportId.current === 'new') {
+        if (activityRecipientType && activityRecipients && activityRecipients.length > 0) {
+          const savedReport = await createReport({ ...data, regionId: region }, {});
+          reportId.current = savedReport.id;
+          updatedReport = false;
+        }
+      } else {
+        await saveReport(reportId.current, data, {});
+        updatedReport = true;
       }
-    } else {
-      await saveReport(reportId.current, data, {});
-      saved = true;
     }
 
     if (newIndex) {
       updatePage(newIndex);
     }
-    return saved;
+    return updatedReport;
   };
 
   const onFormSubmit = async (data) => {
     const report = await submitReport(reportId.current, data);
-    updateSubmitted(report.status === 'submitted');
+    updateStatus(report.status);
+  };
+
+  const onReview = async (data) => {
+    const report = await reviewReport(reportId.current, data);
+    updateStatus(report.status);
   };
 
   return (
@@ -163,14 +203,17 @@ function ActivityReport({ match }) {
       <Helmet titleTemplate="%s - Activity Report - TTA Smart Hub" defaultTitle="TTA Smart Hub - Activity Report" />
       <h1 className="new-activity-report">New activity report for Region 14</h1>
       <Navigator
+        initialLastUpdated={initialLastUpdated}
         reportId={reportId.current}
         currentPage={currentPage}
-        submitted={submitted}
         additionalData={initialAdditionalData}
         initialData={{ ...defaultValues, ...initialFormData }}
         pages={pages}
         onFormSubmit={onFormSubmit}
         onSave={onSave}
+        status={status}
+        approvingManager={approvingManager}
+        onReview={onReview}
       />
     </>
   );
@@ -178,6 +221,10 @@ function ActivityReport({ match }) {
 
 ActivityReport.propTypes = {
   match: ReactRouterPropTypes.match.isRequired,
+  location: ReactRouterPropTypes.location.isRequired,
+  user: PropTypes.shape({
+    id: PropTypes.number,
+  }).isRequired,
 };
 
 export default ActivityReport;
diff --git a/frontend/src/pages/Admin/PermissionHelpers.js b/frontend/src/pages/Admin/PermissionHelpers.js
index 7c507f1cd6..050312cfc0 100644
--- a/frontend/src/pages/Admin/PermissionHelpers.js
+++ b/frontend/src/pages/Admin/PermissionHelpers.js
@@ -1,8 +1,13 @@
 import _ from 'lodash';
-import { REGIONAL_SCOPES, GLOBAL_SCOPES, REGIONS } from '../../Constants';
+import {
+  REGIONAL_SCOPES,
+  GLOBAL_SCOPES,
+  REGIONS,
+  DECIMAL_BASE,
+} from '../../Constants';
 
-const regionalScopeIds = Object.keys(REGIONAL_SCOPES).map((s) => parseInt(s, 10));
-const globalScopeIds = Object.keys(GLOBAL_SCOPES).map((s) => parseInt(s, 10));
+const regionalScopeIds = Object.keys(REGIONAL_SCOPES).map((s) => parseInt(s, DECIMAL_BASE));
+const globalScopeIds = Object.keys(GLOBAL_SCOPES).map((s) => parseInt(s, DECIMAL_BASE));
 const allScopes = { ...REGIONAL_SCOPES, ...GLOBAL_SCOPES };
 
 export function scopeFromId(scopeId) {
diff --git a/frontend/src/pages/Admin/UserPermissions.js b/frontend/src/pages/Admin/UserPermissions.js
index f8ec91c504..89446dc4c9 100644
--- a/frontend/src/pages/Admin/UserPermissions.js
+++ b/frontend/src/pages/Admin/UserPermissions.js
@@ -5,7 +5,7 @@ import {
   Checkbox, Grid, Fieldset,
 } from '@trussworks/react-uswds';
 
-import { REGIONAL_SCOPES } from '../../Constants';
+import { REGIONAL_SCOPES, DECIMAL_BASE } from '../../Constants';
 import PermissionCheckboxLabel from './components/PermissionCheckboxLabel';
 import CurrentPermissions from './components/CurrentPermissions';
 import RegionDropdown from '../../components/RegionDropdown';
@@ -82,7 +82,7 @@ function UserPermissions({
 
   const onSelectedRegionChange = (e) => {
     const { value } = e.target;
-    updateSelectedRegion(parseInt(value, 10));
+    updateSelectedRegion(parseInt(value, DECIMAL_BASE));
   };
 
   return (
diff --git a/frontend/src/pages/Admin/UserSection.js b/frontend/src/pages/Admin/UserSection.js
index a7e3938ae5..f9cb4710f4 100644
--- a/frontend/src/pages/Admin/UserSection.js
+++ b/frontend/src/pages/Admin/UserSection.js
@@ -7,6 +7,7 @@ import {
 import UserInfo from './UserInfo';
 import UserPermissions from './UserPermissions';
 import { userGlobalPermissions, userRegionalPermissions } from './PermissionHelpers';
+import { DECIMAL_BASE } from '../../Constants';
 
 const NUMBER_FIELDS = [
   'homeRegionId',
@@ -29,13 +30,13 @@ function UserSection({ user, onSave }) {
     const { name, value } = e.target;
     updateUser({
       ...formUser,
-      [name]: NUMBER_FIELDS.includes(name) ? parseInt(value, 10) : value,
+      [name]: NUMBER_FIELDS.includes(name) ? parseInt(value, DECIMAL_BASE) : value,
     });
   };
 
   const onPermissionChange = (e, strRegion) => {
-    const scope = parseInt(e.target.name, 10);
-    const region = parseInt(strRegion, 10);
+    const scope = parseInt(e.target.name, DECIMAL_BASE);
+    const region = parseInt(strRegion, DECIMAL_BASE);
     const { checked } = e.target;
 
     if (checked) {
diff --git a/frontend/src/pages/Admin/__tests__/UserPermissions.js b/frontend/src/pages/Admin/__tests__/UserPermissions.js
index 90691e3123..7afc5a6a0a 100644
--- a/frontend/src/pages/Admin/__tests__/UserPermissions.js
+++ b/frontend/src/pages/Admin/__tests__/UserPermissions.js
@@ -5,7 +5,7 @@ import { render, screen, within } from '@testing-library/react';
 
 import UserPermissions from '../UserPermissions';
 import { withText } from '../../../testHelpers';
-import { SCOPE_IDS } from '../../../Constants';
+import { SCOPE_IDS, DECIMAL_BASE } from '../../../Constants';
 
 const {
   READ_ACTIVITY_REPORTS,
@@ -46,7 +46,7 @@ describe('UserPermissions', () => {
 
     it('has correct global permissions checked', () => {
       const checkbox = screen.getByRole('checkbox', { checked: true });
-      expect(checkbox.name).toBe(ADMIN.toString(10));
+      expect(checkbox.name).toBe(ADMIN.toString(DECIMAL_BASE));
     });
 
     it('displays the current regional permissions', () => {
diff --git a/frontend/src/pages/Admin/__tests__/index.js b/frontend/src/pages/Admin/__tests__/index.js
index d73fa2767e..417bfd905f 100644
--- a/frontend/src/pages/Admin/__tests__/index.js
+++ b/frontend/src/pages/Admin/__tests__/index.js
@@ -29,7 +29,7 @@ describe('Admin Page', () => {
     const users = [
       {
         id: 2,
-        email: 'email',
+        email: 'gs@hogwarts.com',
         name: undefined,
         homeRegionId: 1,
         role: 'Grantee Specialist',
@@ -37,7 +37,7 @@ describe('Admin Page', () => {
       },
       {
         id: 3,
-        email: 'email',
+        email: 'potter@hogwarts.com',
         name: 'Harry Potter',
         homeRegionId: 1,
         role: 'Grantee Specialist',
@@ -63,6 +63,23 @@ describe('Admin Page', () => {
         expect(links[0]).toHaveTextContent('Harry Potter');
       });
 
+      it('User list is filterable by email', async () => {
+        const filter = await screen.findByLabelText('Filter Users');
+        userEvent.type(filter, '@hogwarts.com');
+        const sideNav = screen.getByTestId('sidenav');
+        const links = within(sideNav).getAllByRole('link');
+        expect(links.length).toBe(2);
+      });
+
+      it('user filtering is case-insentive', async () => {
+        const filter = await screen.findByLabelText('Filter Users');
+        userEvent.type(filter, 'harry');
+        const sideNav = screen.getByTestId('sidenav');
+        const links = within(sideNav).getAllByRole('link');
+        expect(links.length).toBe(1);
+        expect(links[0]).toHaveTextContent('Harry Potter');
+      });
+
       it('allows a user to be selected', async () => {
         const button = await screen.findByText('Harry Potter');
         userEvent.click(button);
diff --git a/frontend/src/pages/Admin/index.js b/frontend/src/pages/Admin/index.js
index 4c1fe51a31..c47bcf0872 100644
--- a/frontend/src/pages/Admin/index.js
+++ b/frontend/src/pages/Admin/index.js
@@ -9,6 +9,7 @@ import UserSection from './UserSection';
 import NavLink from '../../components/NavLink';
 import Container from '../../components/Container';
 import { updateUser, getUsers } from '../../fetchers/Admin';
+import { DECIMAL_BASE } from '../../Constants';
 
 /**
  * Render the left hand user navigation in the Admin UI. Use the user's full name
@@ -65,7 +66,7 @@ function Admin(props) {
   useEffect(() => {
     if (userId) {
       updateSelectedUser(users.find((u) => (
-        u.id === parseInt(userId, 10)
+        u.id === parseInt(userId, DECIMAL_BASE)
       )));
       updateSaved(false);
     }
@@ -81,7 +82,7 @@ function Admin(props) {
 
   const filteredUsers = _.filter(users, (u) => {
     const { email, name } = u;
-    return `${email}${name}`.includes(userSearch);
+    return `${email}${name}`.toLowerCase().includes(userSearch.toLowerCase());
   });
 
   const onSave = async (newUser) => {
diff --git a/package.json b/package.json
index 94b2ee5164..2c560b4b5f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "server:debug": "nodemon src/index.js --exec babel-node --inspect",
     "client": "yarn --cwd frontend start",
     "test": "jest src",
-    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --runInBand --coverage --reporters=default --reporters=jest-junit",
+    "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml POSTGRES_USERNAME=postgres POSTGRES_DB=ttasmarthub CURRENT_USER_ID=5 CI=true jest src --coverage --reporters=default --reporters=jest-junit",
     "test:all": "yarn test:ci && yarn --cwd frontend test:ci",
     "lint": "eslint src",
     "lint:ci": "eslint -f eslint-formatter-multiple src",
@@ -42,7 +42,7 @@
     "docker:deps": "docker-compose run --rm backend yarn install && docker-compose run --rm frontend yarn install",
     "docker:start": "docker-compose up",
     "docker:stop": "docker-compose down",
-    "docker:test": "docker-compose run --rm backend yarn test:ci && docker-compose run --rm frontend yarn test:ci",
+    "docker:test": "./bin/run-tests",
     "docker:test:be": "docker-compose run --rm backend yarn test",
     "docker:lint": "docker-compose run --rm backend yarn lint:ci && docker-compose run --rm frontend yarn lint:ci",
     "docker:shell:frontend": "docker-compose run --rm frontend /bin/bash",
diff --git a/src/middleware/authMiddleware.test.js b/src/middleware/authMiddleware.test.js
index c77041b7bf..20b188fe03 100644
--- a/src/middleware/authMiddleware.test.js
+++ b/src/middleware/authMiddleware.test.js
@@ -38,8 +38,13 @@ describe('authMiddleware', () => {
     })
   );
 
+  const destroyUser = async (user) => (
+    User.destroy({ where: { id: user.id } })
+  );
+
   it('should allow access if user data is present', async () => {
     await setupUser(mockUser);
+    process.env.CURRENT_USER_ID = 63;
 
     const mockNext = jest.fn();
     const mockSession = jest.fn();
@@ -55,6 +60,7 @@ describe('authMiddleware', () => {
     await authMiddleware(mockRequest, mockResponse, mockNext);
     expect(mockResponse.redirect).not.toHaveBeenCalled();
     expect(mockNext).toHaveBeenCalled();
+    await destroyUser(mockUser);
   });
 
   it('should redirect to login if user data is not present', async () => {
@@ -125,6 +131,7 @@ describe('authMiddleware', () => {
     await authMiddleware(mockRequest, mockResponse, mockNext);
     expect(mockResponse.redirect).not.toHaveBeenCalled();
     expect(mockNext).toHaveBeenCalled();
+    await destroyUser(user);
   });
 
   it('require authorization if variables are set NOT for UAT or accessibility testing', async () => {
diff --git a/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js b/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js
new file mode 100644
index 0000000000..137ee344a2
--- /dev/null
+++ b/src/migrations/20210201174748-add-manager-notes-to-activity-reports.js
@@ -0,0 +1,16 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.addColumn(
+      'ActivityReports',
+      'managerNotes',
+      {
+        type: Sequelize.DataTypes.TEXT,
+        allowNull: true,
+      },
+    );
+  },
+
+  down: async (queryInterface) => {
+    queryInterface.removeColumn('ActivityReports', 'managerNotes');
+  },
+};
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index 7ad103d90a..e61fcaa1ac 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -102,6 +102,10 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.INTEGER,
       allowNull: false,
     },
+    managerNotes: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+    },
     status: {
       allowNull: false,
       type: DataTypes.STRING,
diff --git a/src/policies/activityReport.js b/src/policies/activityReport.js
index f501e5d387..2c1800bf2c 100644
--- a/src/policies/activityReport.js
+++ b/src/policies/activityReport.js
@@ -15,6 +15,10 @@ export default class ActivityReport {
     this.activityReport = activityReport;
   }
 
+  canReview() {
+    return this.isApprovingManager();
+  }
+
   canCreate() {
     return this.canWriteInRegion();
   }
diff --git a/src/policies/activityReport.test.js b/src/policies/activityReport.test.js
index 93e2967164..d434842ac5 100644
--- a/src/policies/activityReport.test.js
+++ b/src/policies/activityReport.test.js
@@ -42,6 +42,20 @@ const manager = user(true, false, 3);
 const otherUser = user(false, true, 4);
 
 describe('Activity Report policies', () => {
+  describe('canReview', () => {
+    it('is true if the user is the approving manager', () => {
+      const report = activityReport(author.id, null, 'submitted', manager.id);
+      const policy = new ActivityReport(manager, report);
+      expect(policy.canReview()).toBeTruthy();
+    });
+
+    it('is false if the user is not the approving manager', () => {
+      const report = activityReport(author.id);
+      const policy = new ActivityReport(author, report);
+      expect(policy.canReview()).toBeFalsy();
+    });
+  });
+
   describe('canCreate', () => {
     it('is true if the user has write permissions in the region', () => {
       const report = activityReport(author.id);
diff --git a/src/policies/user.js b/src/policies/user.js
index e462c8dc8c..1fede401d0 100644
--- a/src/policies/user.js
+++ b/src/policies/user.js
@@ -9,7 +9,8 @@ export default class Users {
   canViewUsersInRegion(region) {
     const permissions = this.user.permissions.find(
       (permission) => (
-        permission.scopeId === SCOPES.READ_WRITE_REPORTS
+        (permission.scopeId === SCOPES.READ_WRITE_REPORTS
+          || permission.scopeId === SCOPES.APPROVE_REPORTS)
         && permission.regionId === region),
     );
     return !_.isUndefined(permissions);
diff --git a/src/routes/activityReports/handlers.js b/src/routes/activityReports/handlers.js
index 9dfe50714d..9950db5f87 100644
--- a/src/routes/activityReports/handlers.js
+++ b/src/routes/activityReports/handlers.js
@@ -2,7 +2,7 @@ import handleErrors from '../../lib/apiErrorHandler';
 import SCOPES from '../../middleware/scopeConstants';
 import ActivityReport from '../../policies/activityReport';
 import {
-  possibleRecipients, activityReportById, createOrUpdate,
+  possibleRecipients, activityReportById, createOrUpdate, review,
 } from '../../services/activityReports';
 import { userById, usersWithPermissions } from '../../services/users';
 
@@ -31,6 +31,33 @@ export async function getApprovers(req, res) {
   }
 }
 
+/**
+ * Review a report setting it's status to approved or needs action
+ *
+ * @param {*} req - request
+ * @param {*} res - response
+ */
+export async function reviewReport(req, res) {
+  try {
+    const { activityReportId } = req.params;
+    const { status, managerNotes } = req.body;
+
+    const user = await userById(req.session.userId);
+    const report = await activityReportById(activityReportId);
+    const authorization = new ActivityReport(user, report);
+
+    if (!authorization.canReview()) {
+      res.sendStatus(403);
+      return;
+    }
+
+    const savedReport = await review(report, status, managerNotes);
+    res.json(savedReport);
+  } catch (error) {
+    await handleErrors(req, res, error, logContext);
+  }
+}
+
 /**
  * Flags a report as submitted for approval
  *
@@ -42,7 +69,7 @@ export async function submitReport(req, res) {
     const { activityReportId } = req.params;
     const { approvingManagerId, additionalNotes } = req.body;
     const newReport = { approvingManagerId, additionalNotes };
-    newReport.status = 'submitted';
+    newReport.status = 'Submitted';
 
     const user = await userById(req.session.userId);
     const report = await activityReportById(activityReportId);
@@ -53,7 +80,7 @@ export async function submitReport(req, res) {
       return;
     }
 
-    const savedReport = await createOrUpdate(newReport, activityReportId);
+    const savedReport = await createOrUpdate(newReport, report);
     res.json(savedReport);
   } catch (error) {
     await handleErrors(req, res, error, logContext);
diff --git a/src/routes/activityReports/handlers.test.js b/src/routes/activityReports/handlers.test.js
index 3f364e3475..995ee787ea 100644
--- a/src/routes/activityReports/handlers.test.js
+++ b/src/routes/activityReports/handlers.test.js
@@ -1,7 +1,15 @@
 import {
-  getReport, saveReport, createReport, getActivityRecipients, getApprovers, submitReport,
+  getReport,
+  saveReport,
+  createReport,
+  getActivityRecipients,
+  getApprovers,
+  submitReport,
+  reviewReport,
 } from './handlers';
-import { activityReportById, createOrUpdate, possibleRecipients } from '../../services/activityReports';
+import {
+  activityReportById, createOrUpdate, possibleRecipients, review,
+} from '../../services/activityReports';
 import { userById, usersWithPermissions } from '../../services/users';
 import ActivityReport from '../../policies/activityReport';
 
@@ -9,6 +17,7 @@ jest.mock('../../services/activityReports', () => ({
   activityReportById: jest.fn(),
   createOrUpdate: jest.fn(),
   possibleRecipients: jest.fn(),
+  review: jest.fn(),
 }));
 
 jest.mock('../../services/users', () => ({
@@ -43,6 +52,36 @@ describe('Activity Report handlers', () => {
     jest.clearAllMocks();
   });
 
+  describe('reviewReport', () => {
+    const request = {
+      ...mockRequest,
+      params: { activityReportId: 1 },
+      body: { status: 'Approved', managerNotes: 'notes' },
+    };
+
+    it('returns the new status', async () => {
+      ActivityReport.mockImplementationOnce(() => ({
+        canReview: () => true,
+      }));
+      activityReportById.mockResolvedValue({ status: 'Approved' });
+      review.mockResolvedValue({ status: 'Approved' });
+      userById.mockResolvedValue({
+        id: 1,
+      });
+      await reviewReport(request, mockResponse);
+      expect(mockResponse.json).toHaveBeenCalledWith({ status: 'Approved' });
+    });
+
+    it('handles unauthorizedRequests', async () => {
+      ActivityReport.mockImplementationOnce(() => ({
+        canReview: () => false,
+      }));
+      activityReportById.mockResolvedValue({ status: 'Approved' });
+      await reviewReport(request, mockResponse);
+      expect(mockResponse.sendStatus).toHaveBeenCalledWith(403);
+    });
+  });
+
   describe('submitReport', () => {
     const request = {
       ...mockRequest,
diff --git a/src/routes/activityReports/index.js b/src/routes/activityReports/index.js
index 7683d23c8a..3559cf5a59 100644
--- a/src/routes/activityReports/index.js
+++ b/src/routes/activityReports/index.js
@@ -1,6 +1,12 @@
 import express from 'express';
 import {
-  getApprovers, submitReport, saveReport, createReport, getReport, getActivityRecipients,
+  getApprovers,
+  submitReport,
+  saveReport,
+  createReport,
+  getReport,
+  getActivityRecipients,
+  reviewReport,
 } from './handlers';
 
 const router = express.Router();
@@ -14,6 +20,7 @@ router.get('/approvers', getApprovers);
 router.get('/activity-recipients', getActivityRecipients);
 router.get('/:activityReportId', getReport);
 router.put('/:activityReportId', saveReport);
+router.put('/:activityReportId/review', reviewReport);
 router.post('/:activityReportId/submit', submitReport);
 
 export default router;
diff --git a/src/routes/admin/user.test.js b/src/routes/admin/user.test.js
index b10c1506d2..c7c40ff1b7 100644
--- a/src/routes/admin/user.test.js
+++ b/src/routes/admin/user.test.js
@@ -55,7 +55,10 @@ describe('User route handler', () => {
     jest.clearAllMocks();
   });
   afterAll(async () => {
-    await User.destroy({ where: {} });
+    await User.destroy({ where: { id: 49 } });
+    await User.destroy({ where: { id: 50 } });
+    await User.destroy({ where: { id: 52 } });
+    await User.destroy({ where: { id: 53 } });
     db.sequelize.close();
   });
 
diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index c5c77f5029..be08229cb1 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -16,21 +16,21 @@ const ORIGINAL_ENV = process.env;
 jest.mock('../../lib/s3Uploader');
 
 const mockUser = {
-  id: process.env.CURRENT_USER_ID,
+  id: 100,
   homeRegionId: 1,
   permissions: [
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 5,
       scopeId: SCOPES.READ_WRITE_REPORTS,
     },
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 6,
       scopeId: SCOPES.READ_WRITE_REPORTS,
     },
     {
-      userId: process.env.CURRENT_USER_ID,
+      userId: 100,
       regionId: 14,
       scopeId: SCOPES.SITE_ACCESS,
     },
@@ -63,6 +63,7 @@ describe('File Upload', () => {
       report = await ActivityReport.create(reportObject);
       process.env.NODE_ENV = 'test';
       process.env.BYPASS_AUTH = 'true';
+      process.env.CURRENT_USER_ID = 100;
     });
     afterAll(async () => {
       await File.destroy({ where: {} });
@@ -104,6 +105,7 @@ describe('File Upload', () => {
       report = await ActivityReport.create(reportObject);
       process.env.NODE_ENV = 'test';
       process.env.BYPASS_AUTH = 'true';
+      process.env.CURRENT_USER_ID = 100;
     });
     afterAll(async () => {
       await File.destroy({ where: {} });
diff --git a/src/services/activityReports.js b/src/services/activityReports.js
index 8501fe9aad..c96346e403 100644
--- a/src/services/activityReports.js
+++ b/src/services/activityReports.js
@@ -109,6 +109,17 @@ async function create(report, transaction) {
   return ActivityReport.create(report, { transaction });
 }
 
+export async function review(report, status, managerNotes) {
+  const updatedReport = await report.update({
+    status,
+    managerNotes,
+  },
+  {
+    fields: ['status', 'managerNotes'],
+  });
+  return updatedReport;
+}
+
 export function activityReportById(activityReportId) {
   return ActivityReport.findOne({
     where: {