finished off the filter builder
removed some imports