Lots of updates, getting ready for first build.