Fixing up snapchat, hopefully for the last time