working on definitions.  Old and new code outputs don't match up yet