Implemented third pass
Merge branch 'master' of github.com:wyvernlang/wyvern