After perf testing, back to classes -- they are way faster then closures/functional style.