Adding Filtering and Updating.
There are still issues, so it's yet to be connected with the rest.