Preliminary point filtering working. Could use some refactoring.