cleanup
-major attempt to refactor filters and use promises