WIP

Change-Id: I027d6d6dc88deddeb1649bfc4469e085daa51b7f
Filter only State changes

Change-Id: Iaa9ef0a7a9158c127fc46f9d5c13da3e2e041037
cleaning...

Change-Id: I8cd4420d0e583ac8271acc87b2a5f3336505ca0a
Cleaning

Change-Id: I5d5bf698e899adec56b017cc85afa4b250a039be
Moved code into a class

Change-Id: Ie067260f96fb93538674b525a70661f7d4ee8831