Almost untested version for v1.1.0dev