made some changes locally
Fixed some merge conflicts
Final statement of work