Need to get completion working
Merged into a single file.

Code completion & syntax check is working, though buggy.