We need to get a plan together for cleaning up & testing these filter functions.