Autopop Updates

Stuff was broken
Merge remote-tracking branch 'origin/Caroline' into justin