Lots of updates. Nearing 1.0