Impl. dev. filtering + adjust context mod. accordingly

Compiles, not tested