gem updates
start to break up Filter#resolve_steps