Progress on #75

Now encryption works (via special case) and tracking pukes.