Begins to handle primitives
Merge branch 'master' of github.com:manniwood/mpjw