phase 4b
Merge https://github.com/suhilaahmed/SWE_Project