worked on conversations and pickett, not sure if what i did will work.
Merge branch 'master' of https://github.com/lerugray/pickett
changed stuff