Pull develop into master

Basic function are complete. Folder structure and compiler are pretty much spot on.