IR logic in progress
blah
Fixed ternary temp var issues
Merge branch 'master' into joon