First pass at values filter, needs reworking