In progress on semantics
Merge branch 'master' of github.com:SCheng4/piconot-external