Step6 implementation + step5 change

-Add filter step5
-Step 6 implementation, add services.