Major refactoring, 1.0 is coming.