Lots of changes. Current version is UNSTABLE.