long gap-returning.

long gap since last worked on the code many changes since last commit.
working on new filtering system