Finish up basic Filter implementation