Adding filterclass (in progress)