Hoisting/Filtering

And now the latest beta attempts to implement the actual filtering!