Made some changes, filter still not working

See title. Going to move stuff from this branch to a new branch due to
an updated master that I need.