these should be vals. I think I fraked that up in a merge conflict