Merged Branch with UI_Testing_Jeffrey Branch.
Now has working filters