worked out a little bit of type resolving with variables and functions
Merge branch 'code' of github.com:kyzhai/SMURF into code