Added SQLFilter functionality, and a ton of not-as-incremental-as-it-should've-been cleanup.