Bug6

Solves Bug #6.
Dont merge this until bug #6 is fully solved, meaning we have some filters for this!