Working on the Tasks filtering - this will break a few specs, will mend them afterwards!