First work on new features.