finished everything but filtering