Handle client review 1

[rowanG077]

Feature description
Client has given the first review. We need to handle it. See #51

Expected steps

• Handle feedback (Maybe plan a in-person session)
• Note that the git flow here is non-standard. Make the changes on the PR branch. But later we need to cherry pick the feedback commits onto develop or rebase develop on main once it is merged.