Lots of unfinished changes. In the process of updating to latest rust build and syntax.