Adding filters, progress on bools. #25