Add support for partials and bodies

Also, fix a scoping error in bin/swiffer