Features/filterspec

This is ready for review