Oh how sexy, filter functionality

Added filter functionality