refactor with new name
initial port complete
Merge branch 'master' of github.com:donahut/mm-twist