About done with the first pass of these new features. Even Beatitude is working!