PR for Jacob's variety

fixes type regression and passes tests.