Merge problems

Some things didn't merge properly. Working to fix this.