Started work on consolidating filter code
Added JSON output