more proxy
half way on cleanup, and separating AC matcher and classifier