Start adding in filtering ability