More red greens and refactors. Filters mostly done