Revert "Revert "Ajay branch3""

Reverts sli-fox/jamms#67