Fixing up encapsulator

TheTemplator was refactored, and some of the changes affected how
encapsulator works