Updated stuff based on Evan's

Here is some stuff that we got to with Evan’s help, just didn’t seem to
get it to work all the way