Revert "reverts changes to backend files so those can be committed on a separate pull request"

This reverts commit 98b4ce39c0f37d3e02d5c0081fa0b066639a9100.