DRAFT/WIP Update to Smack 4