Begin merging pgpchat views and code