Filtering "working" will need to change this for a better system in the
future