Filter almost totally working

need to check some of the date/timing stuffs and clean up ridiculous
amounts of commented out code, but almost there