Chip in is not finished, but greg needs stuff

I changed models as part of this branch which greg needs. But ChipIn, the branch name, isn't technically working