Changes from past 4 weeks

FR1.1 - COMPLETE
FR1.2 - COMPLETE
FR2.1 - COMPLETE
FR2.2 - COMPLETE