First set of changes, but not ready for release yet.