update Jason's work

Hopefully this gets committed to the right repo