Start of filtering implementation

Change-Id: Iebf71deb4739703d87b944300cbc1b8ee2daacc5