Initial development for next app version.