3.0

Skipped the actual refactorings.