2-factor with cross val
trips and quads, ugly but w/e

Signed-off-by: wshanley <wshanley@gmail.com>