diff --git a/Cargo.toml b/Cargo.toml
index 62be72f770747..309fffc571941 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,6 +103,10 @@ debug_asset_server = ["bevy_internal/debug_asset_server"]
 # Enable animation support, and glTF animation loading
 animation = ["bevy_internal/animation"]
 
+spirv = ["bevy_internal/spirv"]
+
+webgpu = ["bevy_internal/webgpu"]
+
 [dependencies]
 bevy_dylib = { path = "crates/bevy_dylib", version = "0.8.0-dev", default-features = false, optional = true }
 bevy_internal = { path = "crates/bevy_internal", version = "0.8.0-dev", default-features = false }
@@ -121,6 +125,8 @@ bytemuck = "1.7"
 # Needed to poll Task examples
 futures-lite = "1.11.3"
 crossbeam-channel = "0.5.0"
+wasm-bindgen-futures = "0.4"
+async-trait = "0.1"
 
 [[example]]
 name = "hello_world"
diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml
index 2ef00a7c53c6c..5bca481aa6f5a 100644
--- a/crates/bevy_animation/Cargo.toml
+++ b/crates/bevy_animation/Cargo.toml
@@ -20,3 +20,6 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.8.0-dev" }
 bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.8.0-dev" }
+
+# other
+async-trait = "0.1"
diff --git a/crates/bevy_animation/src/lib.rs b/crates/bevy_animation/src/lib.rs
index 7882ad4d2f274..406815f455002 100644
--- a/crates/bevy_animation/src/lib.rs
+++ b/crates/bevy_animation/src/lib.rs
@@ -4,6 +4,7 @@
 
 use std::ops::Deref;
 
+use async_trait::async_trait;
 use bevy_app::{App, CoreStage, Plugin};
 use bevy_asset::{AddAsset, Assets, Handle};
 use bevy_core::Name;
@@ -289,8 +290,9 @@ pub fn animation_player(
 #[derive(Default)]
 pub struct AnimationPlugin {}
 
+#[async_trait]
 impl Plugin for AnimationPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<AnimationClip>()
             .register_type::<AnimationPlayer>()
             .add_system_to_stage(
diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml
index 2dd25147e42f9..fde0412f35c33 100644
--- a/crates/bevy_app/Cargo.toml
+++ b/crates/bevy_app/Cargo.toml
@@ -25,6 +25,7 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.8.0-dev" }
 # other
 serde = { version = "1.0", features = ["derive"], optional = true }
 ron = { version = "0.7.0", optional = true }
+async-trait = "0.1"
 
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs
index cdf1984c8b01e..2a46e08c9fef8 100644
--- a/crates/bevy_app/src/app.rs
+++ b/crates/bevy_app/src/app.rs
@@ -53,7 +53,7 @@ pub struct App {
     /// the application's event loop and advancing the [`Schedule`].
     /// Typically, it is not configured manually, but set by one of Bevy's built-in plugins.
     /// See `bevy::winit::WinitPlugin` and [`ScheduleRunnerPlugin`](crate::schedule_runner::ScheduleRunnerPlugin).
-    pub runner: Box<dyn Fn(App)>,
+    pub runner: Box<dyn Fn(App) + Send>,
     /// A container of [`Stage`]s set to be run in a linear order.
     pub schedule: Schedule,
     sub_apps: HashMap<Box<dyn AppLabel>, SubApp>,
@@ -62,7 +62,7 @@ pub struct App {
 /// Each `SubApp` has its own [`Schedule`] and [`World`], enabling a separation of concerns.
 struct SubApp {
     app: App,
-    runner: Box<dyn Fn(&mut World, &mut App)>,
+    runner: Box<dyn Fn(&mut World, &mut App) + Send>,
 }
 
 impl Default for App {
@@ -744,7 +744,7 @@ impl App {
     /// App::new()
     ///     .set_runner(my_runner);
     /// ```
-    pub fn set_runner(&mut self, run_fn: impl Fn(App) + 'static) -> &mut Self {
+    pub fn set_runner(&mut self, run_fn: impl Fn(App) + Send + 'static) -> &mut Self {
         self.runner = Box::new(run_fn);
         self
     }
@@ -763,12 +763,12 @@ impl App {
     /// #
     /// App::new().add_plugin(bevy_log::LogPlugin::default());
     /// ```
-    pub fn add_plugin<T>(&mut self, plugin: T) -> &mut Self
+    pub async fn add_plugin<T>(&mut self, plugin: T) -> &mut Self
     where
         T: Plugin,
     {
         debug!("added plugin: {}", plugin.name());
-        plugin.build(self);
+        plugin.build(self).await;
         self
     }
 
@@ -795,10 +795,10 @@ impl App {
     /// App::new()
     ///     .add_plugins(MinimalPlugins);
     /// ```
-    pub fn add_plugins<T: PluginGroup>(&mut self, mut group: T) -> &mut Self {
+    pub async fn add_plugins<T: PluginGroup>(&mut self, mut group: T) -> &mut Self {
         let mut plugin_group_builder = PluginGroupBuilder::default();
         group.build(&mut plugin_group_builder);
-        plugin_group_builder.finish(self);
+        plugin_group_builder.finish(self).await;
         self
     }
 
@@ -813,6 +813,7 @@ impl App {
     ///
     /// ```
     /// # use bevy_app::{prelude::*, PluginGroupBuilder};
+    /// # use async_trait::async_trait;
     /// #
     /// # // Dummies created to avoid using bevy_internal which pulls in too many dependencies.
     /// # struct DefaultPlugins;
@@ -823,8 +824,9 @@ impl App {
     /// # }
     /// #
     /// # struct MyOwnPlugin;
+    /// # #[async_trait]
     /// # impl Plugin for MyOwnPlugin {
-    /// #     fn build(&self, app: &mut App){;}
+    /// #     async fn build(&self, app: &mut App){;}
     /// # }
     /// #
     /// App::new()
@@ -832,7 +834,7 @@ impl App {
     ///             group.add_before::<bevy_log::LogPlugin, _>(MyOwnPlugin)
     ///         });
     /// ```
-    pub fn add_plugins_with<T, F>(&mut self, mut group: T, func: F) -> &mut Self
+    pub async fn add_plugins_with<T, F>(&mut self, mut group: T, func: F) -> &mut Self
     where
         T: PluginGroup,
         F: FnOnce(&mut PluginGroupBuilder) -> &mut PluginGroupBuilder,
@@ -840,7 +842,7 @@ impl App {
         let mut plugin_group_builder = PluginGroupBuilder::default();
         group.build(&mut plugin_group_builder);
         func(&mut plugin_group_builder);
-        plugin_group_builder.finish(self);
+        plugin_group_builder.finish(self).await;
         self
     }
 
@@ -863,7 +865,7 @@ impl App {
         &mut self,
         label: impl AppLabel,
         app: App,
-        sub_app_runner: impl Fn(&mut World, &mut App) + 'static,
+        sub_app_runner: impl Fn(&mut World, &mut App) + Send + 'static,
     ) -> &mut Self {
         self.sub_apps.insert(
             Box::new(label),
diff --git a/crates/bevy_app/src/plugin.rs b/crates/bevy_app/src/plugin.rs
index e6e70cf856029..24c1b88b8e152 100644
--- a/crates/bevy_app/src/plugin.rs
+++ b/crates/bevy_app/src/plugin.rs
@@ -1,13 +1,15 @@
 use crate::App;
+use async_trait::async_trait;
 use std::any::Any;
 
 /// A collection of Bevy app logic and configuration.
 ///
 /// Plugins configure an [`App`]. When an [`App`] registers a plugin,
 /// the plugin's [`Plugin::build`] function is run.
+#[async_trait]
 pub trait Plugin: Any + Send + Sync {
     /// Configures the [`App`] to which this plugin is added.
-    fn build(&self, app: &mut App);
+    async fn build(&self, app: &mut App);
     /// Configures a name for the [`Plugin`] which is primarily used for debugging.
     fn name(&self) -> &str {
         std::any::type_name::<Self>()
diff --git a/crates/bevy_app/src/plugin_group.rs b/crates/bevy_app/src/plugin_group.rs
index d707634fd8503..9b745c101ea48 100644
--- a/crates/bevy_app/src/plugin_group.rs
+++ b/crates/bevy_app/src/plugin_group.rs
@@ -127,12 +127,12 @@ impl PluginGroupBuilder {
 
     /// Consumes the [`PluginGroupBuilder`] and [builds](Plugin::build) the contained [`Plugin`]s
     /// in the order specified.
-    pub fn finish(self, app: &mut App) {
+    pub async fn finish(self, app: &mut App) {
         for ty in &self.order {
             if let Some(entry) = self.plugins.get(ty) {
                 if entry.enabled {
                     debug!("added plugin: {}", entry.plugin.name());
-                    entry.plugin.build(app);
+                    entry.plugin.build(app).await;
                 }
             }
         }
@@ -141,22 +141,27 @@ impl PluginGroupBuilder {
 
 #[cfg(test)]
 mod tests {
+    use async_trait::async_trait;
+
     use super::PluginGroupBuilder;
     use crate::{App, Plugin};
 
     struct PluginA;
+    #[async_trait]
     impl Plugin for PluginA {
-        fn build(&self, _: &mut App) {}
+        async fn build(&self, _: &mut App) {}
     }
 
     struct PluginB;
+    #[async_trait]
     impl Plugin for PluginB {
-        fn build(&self, _: &mut App) {}
+        async fn build(&self, _: &mut App) {}
     }
 
     struct PluginC;
+    #[async_trait]
     impl Plugin for PluginC {
-        fn build(&self, _: &mut App) {}
+        async fn build(&self, _: &mut App) {}
     }
 
     #[test]
diff --git a/crates/bevy_app/src/schedule_runner.rs b/crates/bevy_app/src/schedule_runner.rs
index aa63ce1a8b3d0..8157d03f50954 100644
--- a/crates/bevy_app/src/schedule_runner.rs
+++ b/crates/bevy_app/src/schedule_runner.rs
@@ -5,6 +5,7 @@ use crate::{
 use bevy_ecs::event::{Events, ManualEventReader};
 use bevy_utils::{Duration, Instant};
 
+use async_trait::async_trait;
 #[cfg(target_arch = "wasm32")]
 use std::{cell::RefCell, rc::Rc};
 #[cfg(target_arch = "wasm32")]
@@ -63,8 +64,9 @@ impl ScheduleRunnerSettings {
 #[derive(Default)]
 pub struct ScheduleRunnerPlugin;
 
+#[async_trait]
 impl Plugin for ScheduleRunnerPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let settings = app
             .world
             .get_resource_or_insert_with(ScheduleRunnerSettings::default)
diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
index 5ccf6ac63f5c9..0dc072320f0f4 100644
--- a/crates/bevy_asset/Cargo.toml
+++ b/crates/bevy_asset/Cargo.toml
@@ -32,6 +32,7 @@ downcast-rs = "1.2.0"
 notify = { version = "=5.0.0-pre.11", optional = true }
 parking_lot = "0.11.0"
 rand = "0.8.0"
+async-trait = "0.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = { version = "0.2" }
diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs
index 23ec2cf3dee66..7ed7cd105f6da 100644
--- a/crates/bevy_asset/src/assets.rs
+++ b/crates/bevy_asset/src/assets.rs
@@ -391,8 +391,12 @@ mod tests {
         #[uuid = "44115972-f31b-46e5-be5c-2b9aece6a52f"]
         struct MyAsset;
         let mut app = App::new();
-        app.add_plugin(bevy_core::CorePlugin)
-            .add_plugin(crate::AssetPlugin);
+        futures_lite::future::block_on(async {
+            app.add_plugin(bevy_core::CorePlugin)
+                .await
+                .add_plugin(crate::AssetPlugin)
+                .await
+        });
         app.add_asset::<MyAsset>();
         let mut assets_before = app.world.resource_mut::<Assets<MyAsset>>();
         let handle = assets_before.add(MyAsset);
diff --git a/crates/bevy_asset/src/debug_asset_server.rs b/crates/bevy_asset/src/debug_asset_server.rs
index b7e3c71c85c89..ffc31f7e109af 100644
--- a/crates/bevy_asset/src/debug_asset_server.rs
+++ b/crates/bevy_asset/src/debug_asset_server.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_ecs::{
     event::Events,
@@ -56,8 +57,9 @@ impl<T: Asset> Default for HandleMap<T> {
     }
 }
 
+#[async_trait]
 impl Plugin for DebugAssetServerPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         IoTaskPool::init(|| {
             TaskPoolBuilder::default()
                 .num_threads(2)
@@ -70,7 +72,8 @@ impl Plugin for DebugAssetServerPlugin {
                 asset_folder: "crates".to_string(),
                 watch_for_changes: true,
             })
-            .add_plugin(AssetPlugin);
+            .add_plugin(AssetPlugin)
+            .await;
         app.insert_non_send_resource(DebugAssetApp(debug_asset_app));
         app.add_system(run_debug_asset_app);
     }
diff --git a/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs b/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
index 8224edd3893da..aeffe7a07ecbc 100644
--- a/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
+++ b/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
@@ -1,4 +1,5 @@
 use crate::{Asset, Assets};
+use async_trait::async_trait;
 use bevy_app::prelude::*;
 use bevy_diagnostic::{Diagnostic, DiagnosticId, Diagnostics, MAX_DIAGNOSTIC_NAME_WIDTH};
 use bevy_ecs::system::{Res, ResMut};
@@ -16,8 +17,9 @@ impl<T: Asset> Default for AssetCountDiagnosticsPlugin<T> {
     }
 }
 
+#[async_trait]
 impl<T: Asset> Plugin for AssetCountDiagnosticsPlugin<T> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_startup_system(Self::setup_system)
             .add_system(Self::diagnostic_system);
     }
diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index b5ba1a1854d02..a1a2e59c04ac1 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -21,6 +21,7 @@ pub mod prelude {
 
 pub use asset_server::*;
 pub use assets::*;
+use async_trait::async_trait;
 pub use bevy_utils::BoxedFuture;
 pub use handle::*;
 pub use info::*;
@@ -78,8 +79,9 @@ pub fn create_platform_default_asset_io(app: &mut App) -> Box<dyn AssetIo> {
     Box::new(source)
 }
 
+#[async_trait]
 impl Plugin for AssetPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if !app.world.contains_resource::<AssetServer>() {
             let source = create_platform_default_asset_io(app);
             let asset_server = AssetServer::with_boxed_io(source);
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index 3e7603f82c700..e93759c90d98f 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -20,6 +20,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 anyhow = "1.0.4"
 rodio = { version = "0.15", default-features = false }
 parking_lot = "0.11.0"
+async-trait = "0.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 rodio = { version = "0.15", default-features = false, features = ["wasm-bindgen"] }
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index e3663e1adf41e..c656b39a105a0 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -7,13 +7,15 @@
 //! # use bevy_app::{App, AppExit};
 //! # use bevy_internal::MinimalPlugins;
 //! fn main() {
+//! #   async {
 //!    App::new()
-//!         .add_plugins(MinimalPlugins)
-//!         .add_plugin(AssetPlugin)
-//!         .add_plugin(AudioPlugin)
+//!         .add_plugins(MinimalPlugins).await
+//!         .add_plugin(AssetPlugin).await
+//!         .add_plugin(AudioPlugin).await
 //! #       .add_system(stop)
 //!         .add_startup_system(play_background_audio)
 //!         .run();
+//! # };
 //! }
 //!
 //! fn play_background_audio(asset_server: Res<AssetServer>, audio: Res<Audio>) {
@@ -38,6 +40,7 @@ pub mod prelude {
     pub use crate::{Audio, AudioOutput, AudioSource, Decodable, PlaybackSettings};
 }
 
+use async_trait::async_trait;
 pub use audio::*;
 pub use audio_output::*;
 pub use audio_source::*;
@@ -51,8 +54,9 @@ use bevy_asset::AddAsset;
 #[derive(Default)]
 pub struct AudioPlugin;
 
+#[async_trait]
 impl Plugin for AudioPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_non_send_resource::<AudioOutput<AudioSource>>()
             .add_asset::<AudioSource>()
             .add_asset::<AudioSink>()
diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml
index 7035d2fbc2235..b502fd57b89f0 100644
--- a/crates/bevy_core/Cargo.toml
+++ b/crates/bevy_core/Cargo.toml
@@ -20,3 +20,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
 # other
 bytemuck = "1.5"
+async-trait = "0.1"
diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs
index 7c7d193564f87..4898879a381d8 100644
--- a/crates/bevy_core/src/lib.rs
+++ b/crates/bevy_core/src/lib.rs
@@ -4,6 +4,7 @@
 mod name;
 mod task_pool_options;
 
+use async_trait::async_trait;
 pub use bytemuck::{bytes_of, cast_slice, Pod, Zeroable};
 pub use name::*;
 pub use task_pool_options::*;
@@ -23,8 +24,9 @@ use std::ops::Range;
 #[derive(Default)]
 pub struct CorePlugin;
 
+#[async_trait]
 impl Plugin for CorePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         // Setup the default bevy task pools
         app.world
             .get_resource::<DefaultTaskPoolOptions>()
diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml
index 89602f5048756..3f7dd30f2428b 100644
--- a/crates/bevy_core_pipeline/Cargo.toml
+++ b/crates/bevy_core_pipeline/Cargo.toml
@@ -27,5 +27,6 @@ bevy_render = { path = "../bevy_render", version = "0.8.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.8.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
+# other
 serde = { version = "1", features = ["derive"] }
-
+async-trait = "0.1"
diff --git a/crates/bevy_core_pipeline/src/core_2d/mod.rs b/crates/bevy_core_pipeline/src/core_2d/mod.rs
index 8acdb42da54ef..70736cb77fc70 100644
--- a/crates/bevy_core_pipeline/src/core_2d/mod.rs
+++ b/crates/bevy_core_pipeline/src/core_2d/mod.rs
@@ -11,6 +11,7 @@ pub mod graph {
     }
 }
 
+use async_trait::async_trait;
 pub use camera_2d::*;
 pub use main_pass_2d_node::*;
 
@@ -32,10 +33,12 @@ use std::ops::Range;
 
 pub struct Core2dPlugin;
 
+#[async_trait]
 impl Plugin for Core2dPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<Camera2d>()
-            .add_plugin(ExtractComponentPlugin::<Camera2d>::default());
+            .add_plugin(ExtractComponentPlugin::<Camera2d>::default())
+            .await;
 
         let render_app = match app.get_sub_app_mut(RenderApp) {
             Ok(render_app) => render_app,
diff --git a/crates/bevy_core_pipeline/src/core_3d/mod.rs b/crates/bevy_core_pipeline/src/core_3d/mod.rs
index 6342d8471291b..f0c6a558f2bf0 100644
--- a/crates/bevy_core_pipeline/src/core_3d/mod.rs
+++ b/crates/bevy_core_pipeline/src/core_3d/mod.rs
@@ -11,6 +11,7 @@ pub mod graph {
     }
 }
 
+use async_trait::async_trait;
 pub use camera_3d::*;
 pub use main_pass_3d_node::*;
 
@@ -38,10 +39,12 @@ use bevy_utils::{FloatOrd, HashMap};
 
 pub struct Core3dPlugin;
 
+#[async_trait]
 impl Plugin for Core3dPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<Camera3d>()
-            .add_plugin(ExtractComponentPlugin::<Camera3d>::default());
+            .add_plugin(ExtractComponentPlugin::<Camera3d>::default())
+            .await;
 
         let render_app = match app.get_sub_app_mut(RenderApp) {
             Ok(render_app) => render_app,
diff --git a/crates/bevy_core_pipeline/src/lib.rs b/crates/bevy_core_pipeline/src/lib.rs
index f8f5db70a3d8c..f6e6304fe180a 100644
--- a/crates/bevy_core_pipeline/src/lib.rs
+++ b/crates/bevy_core_pipeline/src/lib.rs
@@ -12,17 +12,22 @@ pub mod prelude {
 }
 
 use crate::{clear_color::ClearColor, core_2d::Core2dPlugin, core_3d::Core3dPlugin};
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_render::extract_resource::ExtractResourcePlugin;
 
 #[derive(Default)]
 pub struct CorePipelinePlugin;
 
+#[async_trait]
 impl Plugin for CorePipelinePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_resource::<ClearColor>()
             .add_plugin(ExtractResourcePlugin::<ClearColor>::default())
+            .await
             .add_plugin(Core2dPlugin)
-            .add_plugin(Core3dPlugin);
+            .await
+            .add_plugin(Core3dPlugin)
+            .await;
     }
 }
diff --git a/crates/bevy_derive/src/bevy_main.rs b/crates/bevy_derive/src/bevy_main.rs
index 4a2650f36c47f..8c06a2c2162ef 100644
--- a/crates/bevy_derive/src/bevy_main.rs
+++ b/crates/bevy_derive/src/bevy_main.rs
@@ -21,17 +21,29 @@ pub fn bevy_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 activity as _,
                 saved_state as _,
                 saved_state_size as _,
-                main,
+                || futures_lite::future::block_on(main()),
             );
         }
 
         #[no_mangle]
         #[cfg(target_os = "ios")]
         extern "C" fn main_rs() {
-            main();
+           futures_lite::future::block_on(main());
         }
 
+        #[cfg(any(target_os = "ios", target_os = "android"))]
         #[allow(unused)]
         #input
+
+        #[cfg(all(not(target_os = "ios"), not(target_os = "android")))]
+        fn main() {
+            #input
+
+            #[cfg(target_arch = "wasm32")]
+            wasm_bindgen_futures::spawn_local(main());
+            #[cfg(not(target_arch = "wasm32"))]
+            futures_lite::future::block_on(main());
+
+        }
     })
 }
diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml
index 5bdd7236e490b..0632c8a0fd4bb 100644
--- a/crates/bevy_diagnostic/Cargo.toml
+++ b/crates/bevy_diagnostic/Cargo.toml
@@ -16,3 +16,6 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" }
 bevy_log = { path = "../bevy_log", version = "0.8.0-dev" }
 bevy_time = { path = "../bevy_time", version = "0.8.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
+
+# other
+async-trait = "0.1"
diff --git a/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
index add37dee3c556..67eeab706923f 100644
--- a/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_ecs::{
     system::{IntoExclusiveSystem, ResMut},
@@ -10,8 +11,9 @@ use crate::{Diagnostic, DiagnosticId, Diagnostics};
 #[derive(Default)]
 pub struct EntityCountDiagnosticsPlugin;
 
+#[async_trait]
 impl Plugin for EntityCountDiagnosticsPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_startup_system(Self::setup_system)
             .add_system(Self::diagnostic_system.exclusive_system());
     }
diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
index 2dd016e30d518..bd1e58cac8f95 100644
--- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs
@@ -1,4 +1,5 @@
 use crate::{Diagnostic, DiagnosticId, Diagnostics};
+use async_trait::async_trait;
 use bevy_app::prelude::*;
 use bevy_ecs::system::{Res, ResMut};
 use bevy_time::Time;
@@ -11,8 +12,9 @@ pub struct FrameTimeDiagnosticsState {
     frame_count: u64,
 }
 
+#[async_trait]
 impl Plugin for FrameTimeDiagnosticsPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         app.add_startup_system(Self::setup_system)
             .insert_resource(FrameTimeDiagnosticsState { frame_count: 0 })
             .add_system(Self::diagnostic_system);
diff --git a/crates/bevy_diagnostic/src/lib.rs b/crates/bevy_diagnostic/src/lib.rs
index 076618bcde060..cb165e29c246d 100644
--- a/crates/bevy_diagnostic/src/lib.rs
+++ b/crates/bevy_diagnostic/src/lib.rs
@@ -2,6 +2,7 @@ mod diagnostic;
 mod entity_count_diagnostics_plugin;
 mod frame_time_diagnostics_plugin;
 mod log_diagnostics_plugin;
+use async_trait::async_trait;
 pub use diagnostic::*;
 pub use entity_count_diagnostics_plugin::EntityCountDiagnosticsPlugin;
 pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin;
@@ -13,8 +14,9 @@ use bevy_app::prelude::*;
 #[derive(Default)]
 pub struct DiagnosticsPlugin;
 
+#[async_trait]
 impl Plugin for DiagnosticsPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_resource::<Diagnostics>();
     }
 }
diff --git a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
index 728f1cd123a5a..b85962f9971e8 100644
--- a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
@@ -1,4 +1,5 @@
 use super::{Diagnostic, DiagnosticId, Diagnostics};
+use async_trait::async_trait;
 use bevy_app::prelude::*;
 use bevy_ecs::system::{Res, ResMut};
 use bevy_log::{debug, info};
@@ -28,8 +29,9 @@ impl Default for LogDiagnosticsPlugin {
     }
 }
 
+#[async_trait]
 impl Plugin for LogDiagnosticsPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.insert_resource(LogDiagnosticsState {
             timer: Timer::new(self.wait_duration, true),
             filter: self.filter.clone(),
diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml
index 169738069c7b0..81cce2496e926 100644
--- a/crates/bevy_dynamic_plugin/Cargo.toml
+++ b/crates/bevy_dynamic_plugin/Cargo.toml
@@ -16,3 +16,4 @@ bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
 
 # other
 libloading = { version = "0.7" }
+async-trait = "0.1"
diff --git a/crates/bevy_dynamic_plugin/src/loader.rs b/crates/bevy_dynamic_plugin/src/loader.rs
index 6cc33e1bd996b..43ea067beaf4f 100644
--- a/crates/bevy_dynamic_plugin/src/loader.rs
+++ b/crates/bevy_dynamic_plugin/src/loader.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use libloading::{Library, Symbol};
 
 use bevy_app::{App, CreatePlugin, Plugin};
@@ -17,18 +18,20 @@ pub unsafe fn dynamically_load_plugin(path: &str) -> (Library, Box<dyn Plugin>)
     (lib, plugin)
 }
 
+#[async_trait]
 pub trait DynamicPluginExt {
     /// # Safety
     ///
     /// Same as [`dynamically_load_plugin`].
-    unsafe fn load_plugin(&mut self, path: &str) -> &mut Self;
+    async unsafe fn load_plugin(&mut self, path: &str) -> &mut Self;
 }
 
+#[async_trait]
 impl DynamicPluginExt for App {
-    unsafe fn load_plugin(&mut self, path: &str) -> &mut Self {
+    async unsafe fn load_plugin(&mut self, path: &str) -> &mut Self {
         let (lib, plugin) = dynamically_load_plugin(path);
         std::mem::forget(lib); // Ensure that the library is not automatically unloaded
-        plugin.build(self);
+        plugin.build(self).await;
         self
     }
 }
diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml
index 1bcd71340cf17..6a6bb8170abef 100644
--- a/crates/bevy_gilrs/Cargo.toml
+++ b/crates/bevy_gilrs/Cargo.toml
@@ -17,3 +17,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
 # other
 gilrs = "0.9.0"
+async-trait = "0.1"
diff --git a/crates/bevy_gilrs/src/lib.rs b/crates/bevy_gilrs/src/lib.rs
index 37fa70a83316a..8bf0d35416c6d 100644
--- a/crates/bevy_gilrs/src/lib.rs
+++ b/crates/bevy_gilrs/src/lib.rs
@@ -1,6 +1,7 @@
 mod converter;
 mod gilrs_system;
 
+use async_trait::async_trait;
 use bevy_app::{App, CoreStage, Plugin, StartupStage};
 use bevy_ecs::schedule::ParallelSystemDescriptorCoercion;
 use bevy_input::InputSystem;
@@ -11,8 +12,9 @@ use gilrs_system::{gilrs_event_startup_system, gilrs_event_system};
 #[derive(Default)]
 pub struct GilrsPlugin;
 
+#[async_trait]
 impl Plugin for GilrsPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         match GilrsBuilder::new()
             .with_default_filters(false)
             .set_update_state(false)
diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml
index 5d9ab53ad21c6..e19d0ea75d7bd 100644
--- a/crates/bevy_gltf/Cargo.toml
+++ b/crates/bevy_gltf/Cargo.toml
@@ -39,3 +39,4 @@ thiserror = "1.0"
 anyhow = "1.0.4"
 base64 = "0.13.0"
 percent-encoding = "2.1"
+async-trait = "0.1"
diff --git a/crates/bevy_gltf/src/lib.rs b/crates/bevy_gltf/src/lib.rs
index b1748f8be8629..5101957c1f28f 100644
--- a/crates/bevy_gltf/src/lib.rs
+++ b/crates/bevy_gltf/src/lib.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 #[cfg(feature = "bevy_animation")]
 use bevy_animation::AnimationClip;
 use bevy_utils::HashMap;
@@ -17,8 +18,9 @@ use bevy_scene::Scene;
 #[derive(Default)]
 pub struct GltfPlugin;
 
+#[async_trait]
 impl Plugin for GltfPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_asset_loader::<GltfLoader>()
             .register_type::<GltfExtras>()
             .add_asset::<Gltf>()
diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs
index 7aa87b330dab5..39891699345e7 100644
--- a/crates/bevy_gltf/src/loader.rs
+++ b/crates/bevy_gltf/src/loader.rs
@@ -29,6 +29,7 @@ use bevy_render::{
     view::VisibleEntities,
 };
 use bevy_scene::Scene;
+#[cfg(not(target_arch = "wasm32"))]
 use bevy_tasks::IoTaskPool;
 use bevy_transform::{components::Transform, TransformBundle};
 
diff --git a/crates/bevy_hierarchy/Cargo.toml b/crates/bevy_hierarchy/Cargo.toml
index f7cb27f106a86..588cf3df50fc1 100644
--- a/crates/bevy_hierarchy/Cargo.toml
+++ b/crates/bevy_hierarchy/Cargo.toml
@@ -20,3 +20,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
 # other
 smallvec = { version = "1.6", features = ["serde", "union", "const_generics"] }
+async-trait = "0.1"
diff --git a/crates/bevy_hierarchy/src/lib.rs b/crates/bevy_hierarchy/src/lib.rs
index 60fa42f525e97..95ff22fc435c1 100644
--- a/crates/bevy_hierarchy/src/lib.rs
+++ b/crates/bevy_hierarchy/src/lib.rs
@@ -5,6 +5,7 @@
 //! from the [`Parent`] to its [`Children`].
 
 mod components;
+use async_trait::async_trait;
 pub use components::*;
 
 mod hierarchy;
@@ -36,8 +37,9 @@ pub enum HierarchySystem {
     ParentUpdate,
 }
 
+#[async_trait]
 impl Plugin for HierarchyPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<Children>()
             .register_type::<Parent>()
             .register_type::<PreviousParent>()
diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml
index 17db1fd140301..56bdae10fc9f7 100644
--- a/crates/bevy_input/Cargo.toml
+++ b/crates/bevy_input/Cargo.toml
@@ -21,3 +21,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
 # other
 serde = { version = "1", features = ["derive"], optional = true }
+async-trait = "0.1"
diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs
index 625b8ed746a61..9f0a2ca49d261 100644
--- a/crates/bevy_input/src/lib.rs
+++ b/crates/bevy_input/src/lib.rs
@@ -5,6 +5,7 @@ pub mod keyboard;
 pub mod mouse;
 pub mod touch;
 
+use async_trait::async_trait;
 pub use axis::*;
 use bevy_ecs::schedule::{ParallelSystemDescriptorCoercion, SystemLabel};
 pub use input::*;
@@ -41,8 +42,9 @@ pub struct InputPlugin;
 #[derive(Debug, PartialEq, Eq, Clone, Hash, SystemLabel)]
 pub struct InputSystem;
 
+#[async_trait]
 impl Plugin for InputPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app
             // keyboard
             .add_event::<KeyboardInput>()
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index 5868ebc494f71..813847d96f84c 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -57,6 +57,12 @@ subpixel_glyph_atlas = ["bevy_text/subpixel_glyph_atlas"]
 # Optimise for WebGL2
 webgl = ["bevy_core_pipeline/webgl", "bevy_pbr/webgl", "bevy_render/webgl"]
 
+
+spirv = ["bevy_render/spirv"]
+
+# Optimise for WebGPU
+webgpu = ["bevy_render/webgpu"]
+
 # enable systems that allow for automated testing on CI
 bevy_ci_testing = ["bevy_app/bevy_ci_testing", "bevy_render/ci_limits"]
 
diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml
index 186784f24a92f..78f4b75b57f9f 100644
--- a/crates/bevy_log/Cargo.toml
+++ b/crates/bevy_log/Cargo.toml
@@ -15,6 +15,10 @@ trace = [ "tracing-error" ]
 bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
+# other
+async-trait = "0.1"
+
+# tracing ecosystem
 tracing-subscriber = {version = "0.3.1", features = ["registry", "env-filter"]}
 tracing-chrome = { version = "0.4.0", optional = true }
 tracing-tracy = { version = "0.10.0", optional = true }
diff --git a/crates/bevy_log/src/lib.rs b/crates/bevy_log/src/lib.rs
index 0259aafd71457..d85653033ed34 100644
--- a/crates/bevy_log/src/lib.rs
+++ b/crates/bevy_log/src/lib.rs
@@ -25,6 +25,7 @@ pub mod prelude {
     };
 }
 
+use async_trait::async_trait;
 pub use bevy_utils::tracing::{
     debug, debug_span, error, error_span, info, info_span, trace, trace_span, warn, warn_span,
     Level,
@@ -52,13 +53,15 @@ use tracing_subscriber::{prelude::*, registry::Registry, EnvFilter};
 /// # use bevy_log::LogSettings;
 /// # use bevy_utils::tracing::Level;
 /// fn main() {
+/// # async {
 ///     App::new()
 ///         .insert_resource(LogSettings {
 ///             level: Level::DEBUG,
 ///             filter: "wgpu=error,bevy_render=info,bevy_ecs=trace".to_string(),
 ///         })
-///         .add_plugins(DefaultPlugins)
+///         .add_plugins(DefaultPlugins).await
 ///         .run();
+/// # };
 /// }
 /// ```
 ///
@@ -76,9 +79,11 @@ use tracing_subscriber::{prelude::*, registry::Registry, EnvFilter};
 /// # use bevy_app::App;
 /// # use bevy_log::LogPlugin;
 /// fn main() {
+/// # async {
 ///     App::new()
-///         .add_plugins_with(DefaultPlugins, |group| group.disable::<LogPlugin>())
+///         .add_plugins_with(DefaultPlugins, |group| group.disable::<LogPlugin>()).await
 ///         .run();
+/// # };
 /// }
 /// ```
 ///
@@ -109,8 +114,9 @@ impl Default for LogSettings {
     }
 }
 
+#[async_trait]
 impl Plugin for LogPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         #[cfg(feature = "trace")]
         {
             let old_handler = panic::take_hook();
diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml
index 37107c44d433a..5c9c66646fcc5 100644
--- a/crates/bevy_pbr/Cargo.toml
+++ b/crates/bevy_pbr/Cargo.toml
@@ -28,3 +28,4 @@ bevy_window = { path = "../bevy_window", version = "0.8.0-dev" }
 bitflags = "1.2"
 # direct dependency required for derive macro
 bytemuck = { version = "1", features = ["derive"] }
+async-trait = "0.1"
diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs
index c0b5668e1a761..54d54957d8bf6 100644
--- a/crates/bevy_pbr/src/lib.rs
+++ b/crates/bevy_pbr/src/lib.rs
@@ -8,6 +8,7 @@ mod pbr_material;
 mod render;
 
 pub use alpha::*;
+use async_trait::async_trait;
 pub use bundle::*;
 pub use light::*;
 pub use material::*;
@@ -71,8 +72,9 @@ pub const SHADOW_SHADER_HANDLE: HandleUntyped =
 #[derive(Default)]
 pub struct PbrPlugin;
 
+#[async_trait]
 impl Plugin for PbrPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         load_internal_asset!(
             app,
             PBR_TYPES_SHADER_HANDLE,
@@ -116,12 +118,15 @@ impl Plugin for PbrPlugin {
             .register_type::<DirectionalLight>()
             .register_type::<PointLight>()
             .add_plugin(MeshRenderPlugin)
+            .await
             .add_plugin(MaterialPlugin::<StandardMaterial>::default())
+            .await
             .init_resource::<AmbientLight>()
             .init_resource::<GlobalVisiblePointLights>()
             .init_resource::<DirectionalLightShadowMap>()
             .init_resource::<PointLightShadowMap>()
             .add_plugin(ExtractResourcePlugin::<AmbientLight>::default())
+            .await
             .add_system_to_stage(
                 CoreStage::PostUpdate,
                 // NOTE: Clusters need to have been added before update_clusters is run so
diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs
index 28620aaec1d03..7fbc797c1f472 100644
--- a/crates/bevy_pbr/src/material.rs
+++ b/crates/bevy_pbr/src/material.rs
@@ -2,6 +2,7 @@ use crate::{
     AlphaMode, DrawMesh, MeshPipeline, MeshPipelineKey, MeshUniform, SetMeshBindGroup,
     SetMeshViewBindGroup,
 };
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_asset::{AddAsset, Asset, AssetServer, Handle};
 use bevy_core_pipeline::core_3d::{AlphaMask3d, Opaque3d, Transparent3d};
@@ -221,11 +222,14 @@ impl<M: SpecializedMaterial> Default for MaterialPlugin<M> {
     }
 }
 
+#[async_trait]
 impl<M: SpecializedMaterial> Plugin for MaterialPlugin<M> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<M>()
             .add_plugin(ExtractComponentPlugin::<Handle<M>>::extract_visible())
-            .add_plugin(RenderAssetPlugin::<M>::default());
+            .await
+            .add_plugin(RenderAssetPlugin::<M>::default())
+            .await;
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
                 .add_render_command::<Transparent3d, DrawMaterial<M>>()
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index 950d32d6fba18..002eed9153986 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -3,6 +3,7 @@ use crate::{
     ShadowPipeline, ViewClusterBindings, ViewLightsUniformOffset, ViewShadowBindings,
     CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT,
 };
+use async_trait::async_trait;
 use bevy_app::Plugin;
 use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped};
 use bevy_ecs::{
@@ -52,8 +53,9 @@ pub const MESH_SHADER_HANDLE: HandleUntyped =
 pub const SKINNING_HANDLE: HandleUntyped =
     HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 13215291596265391738);
 
+#[async_trait]
 impl Plugin for MeshRenderPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         load_internal_asset!(
             app,
             MESH_VIEW_TYPES_HANDLE,
@@ -82,7 +84,8 @@ impl Plugin for MeshRenderPlugin {
         load_internal_asset!(app, MESH_SHADER_HANDLE, "mesh.wgsl", Shader::from_wgsl);
         load_internal_asset!(app, SKINNING_HANDLE, "skinning.wgsl", Shader::from_wgsl);
 
-        app.add_plugin(UniformComponentPlugin::<MeshUniform>::default());
+        app.add_plugin(UniformComponentPlugin::<MeshUniform>::default())
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
diff --git a/crates/bevy_pbr/src/render/skinning.wgsl b/crates/bevy_pbr/src/render/skinning.wgsl
index 2a48556301254..3596ba4c76231 100644
--- a/crates/bevy_pbr/src/render/skinning.wgsl
+++ b/crates/bevy_pbr/src/render/skinning.wgsl
@@ -11,10 +11,10 @@ fn add_matrix(
     b: mat4x4<f32>,
 ) -> mat4x4<f32> {
     return mat4x4<f32>(
-        a.x + b.x,
-        a.y + b.y,
-        a.z + b.z,
-        a.w + b.w,
+        a[0] + b[0],
+        a[1] + b[1],
+        a[2] + b[2],
+        a[3] + b[3],
     );
 }
 
@@ -29,10 +29,10 @@ fn skin_model(
 }
 
 fn inverse_transpose_3x3(in: mat3x3<f32>) -> mat3x3<f32> {
-    let x = cross(in.y, in.z);
-    let y = cross(in.z, in.x);
-    let z = cross(in.x, in.y);
-    let det = dot(in.z, z);
+    let x = cross(in[1], in[2]);
+    let y = cross(in[2], in[0]);
+    let z = cross(in[0], in[1]);
+    let det = dot(in[2], z);
     return mat3x3<f32>(
         x / det,
         y / det,
diff --git a/crates/bevy_pbr/src/wireframe.rs b/crates/bevy_pbr/src/wireframe.rs
index 6a7a4c3c297c2..756acaa86bd52 100644
--- a/crates/bevy_pbr/src/wireframe.rs
+++ b/crates/bevy_pbr/src/wireframe.rs
@@ -1,5 +1,6 @@
 use crate::MeshPipeline;
 use crate::{DrawMesh, MeshPipelineKey, MeshUniform, SetMeshBindGroup, SetMeshViewBindGroup};
+use async_trait::async_trait;
 use bevy_app::Plugin;
 use bevy_asset::{load_internal_asset, Handle, HandleUntyped};
 use bevy_core_pipeline::core_3d::Opaque3d;
@@ -26,8 +27,9 @@ pub const WIREFRAME_SHADER_HANDLE: HandleUntyped =
 #[derive(Debug, Default)]
 pub struct WireframePlugin;
 
+#[async_trait]
 impl Plugin for WireframePlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         load_internal_asset!(
             app,
             WIREFRAME_SHADER_HANDLE,
@@ -36,7 +38,8 @@ impl Plugin for WireframePlugin {
         );
 
         app.init_resource::<WireframeConfig>()
-            .add_plugin(ExtractResourcePlugin::<WireframeConfig>::default());
+            .add_plugin(ExtractResourcePlugin::<WireframeConfig>::default())
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
index fc9796e83f83f..4dbf635d9a0c4 100644
--- a/crates/bevy_render/Cargo.toml
+++ b/crates/bevy_render/Cargo.toml
@@ -25,6 +25,8 @@ tracing-tracy = []
 wgpu_trace = ["wgpu/trace"]
 ci_limits = []
 webgl = ["wgpu/webgl"]
+spirv = ["wgpu/spirv"]
+webgpu = []
 
 [dependencies]
 # bevy
@@ -46,7 +48,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 image = { version = "0.24", default-features = false }
 
 # misc
-wgpu = { version = "0.12.0", features = ["spirv"] }
+wgpu = { version = "0.12.0" }
 codespan-reporting = "0.11.0"
 naga = { version = "0.8.0", features = ["glsl-in", "spv-in", "spv-out", "wgsl-in", "wgsl-out"] }
 serde = { version = "1", features = ["derive"] }
@@ -71,3 +73,4 @@ ruzstd = { version = "0.2.4", optional = true }
 # For transcoding of UASTC/ETC1S universal formats, and for .basis file support
 basis-universal = { version = "0.2.0", optional = true }
 encase = { version = "0.2", features = ["glam"] }
+async-trait = "0.1"
diff --git a/crates/bevy_render/src/camera/mod.rs b/crates/bevy_render/src/camera/mod.rs
index 37acb0b895ea7..5a68c78fa1c39 100644
--- a/crates/bevy_render/src/camera/mod.rs
+++ b/crates/bevy_render/src/camera/mod.rs
@@ -3,6 +3,7 @@ mod camera;
 mod camera_driver_node;
 mod projection;
 
+use async_trait::async_trait;
 pub use camera::*;
 pub use camera_driver_node::*;
 pub use projection::*;
@@ -18,8 +19,9 @@ use bevy_app::{App, Plugin};
 #[derive(Default)]
 pub struct CameraPlugin;
 
+#[async_trait]
 impl Plugin for CameraPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<Camera>()
             .register_type::<Visibility>()
             .register_type::<ComputedVisibility>()
@@ -30,8 +32,11 @@ impl Plugin for CameraPlugin {
             .register_type::<Aabb>()
             .register_type::<CameraRenderGraph>()
             .add_plugin(CameraProjectionPlugin::<Projection>::default())
+            .await
             .add_plugin(CameraProjectionPlugin::<OrthographicProjection>::default())
-            .add_plugin(CameraProjectionPlugin::<PerspectiveProjection>::default());
+            .await
+            .add_plugin(CameraProjectionPlugin::<PerspectiveProjection>::default())
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app.add_system_to_stage(RenderStage::Extract, extract_cameras);
diff --git a/crates/bevy_render/src/camera/projection.rs b/crates/bevy_render/src/camera/projection.rs
index bd40d52a620a5..fd5726748e104 100644
--- a/crates/bevy_render/src/camera/projection.rs
+++ b/crates/bevy_render/src/camera/projection.rs
@@ -1,6 +1,7 @@
 use std::marker::PhantomData;
 
 use super::DepthCalculation;
+use async_trait::async_trait;
 use bevy_app::{App, CoreStage, Plugin, StartupStage};
 use bevy_ecs::{prelude::*, reflect::ReflectComponent};
 use bevy_math::Mat4;
@@ -20,8 +21,9 @@ impl<T: CameraProjection> Default for CameraProjectionPlugin<T> {
 #[derive(SystemLabel, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct CameraUpdateSystem;
 
+#[async_trait]
 impl<T: CameraProjection + Component + GetTypeRegistration> Plugin for CameraProjectionPlugin<T> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<T>()
             .add_startup_system_to_stage(
                 StartupStage::PostStartup,
diff --git a/crates/bevy_render/src/extract_component.rs b/crates/bevy_render/src/extract_component.rs
index 673b23c30770e..f7ab522e870ad 100644
--- a/crates/bevy_render/src/extract_component.rs
+++ b/crates/bevy_render/src/extract_component.rs
@@ -4,6 +4,7 @@ use crate::{
     view::ComputedVisibility,
     RenderApp, RenderStage,
 };
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_asset::{Asset, Handle};
 use bevy_ecs::{
@@ -58,8 +59,9 @@ impl<C> Default for UniformComponentPlugin<C> {
     }
 }
 
+#[async_trait]
 impl<C: Component + ShaderType + WriteInto + Clone> Plugin for UniformComponentPlugin<C> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
                 .insert_resource(ComponentUniforms::<C>::default())
@@ -155,8 +157,9 @@ impl<C, F> ExtractComponentPlugin<C, F> {
     }
 }
 
+#[async_trait]
 impl<C: ExtractComponent> Plugin for ExtractComponentPlugin<C> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             if self.only_extract_visible {
                 render_app
diff --git a/crates/bevy_render/src/extract_resource.rs b/crates/bevy_render/src/extract_resource.rs
index 5db3be904b263..ca092c469d883 100644
--- a/crates/bevy_render/src/extract_resource.rs
+++ b/crates/bevy_render/src/extract_resource.rs
@@ -1,5 +1,6 @@
 use std::marker::PhantomData;
 
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_ecs::system::{Commands, Res, Resource};
 pub use bevy_render_macros::ExtractResource;
@@ -29,8 +30,9 @@ impl<R: ExtractResource> Default for ExtractResourcePlugin<R> {
     }
 }
 
+#[async_trait]
 impl<R: ExtractResource> Plugin for ExtractResourcePlugin<R> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app.add_system_to_stage(RenderStage::Extract, extract_resource::<R>);
         }
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
index 0caa1a75bc29c..aa1b19ef7ffb5 100644
--- a/crates/bevy_render/src/lib.rs
+++ b/crates/bevy_render/src/lib.rs
@@ -27,6 +27,7 @@ pub mod prelude {
     };
 }
 
+use async_trait::async_trait;
 pub use once_cell;
 
 use crate::{
@@ -111,9 +112,10 @@ pub struct RenderApp;
 #[derive(Default)]
 struct ScratchRenderWorld(World);
 
+#[async_trait]
 impl Plugin for RenderPlugin {
     /// Initializes the renderer, sets up the [`RenderStage`](RenderStage) and creates the rendering sub-app.
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let options = app
             .world
             .get_resource::<settings::WgpuSettings>()
@@ -141,9 +143,8 @@ impl Plugin for RenderPlugin {
                 compatible_surface: surface.as_ref(),
                 ..Default::default()
             };
-            let (device, queue, adapter_info) = futures_lite::future::block_on(
-                renderer::initialize_renderer(&instance, &options, &request_adapter_options),
-            );
+            let (device, queue, adapter_info) =
+                renderer::initialize_renderer(&instance, &options, &request_adapter_options).await;
             debug!("Configured wgpu adapter Limits: {:#?}", device.limits());
             debug!("Configured wgpu adapter Features: {:#?}", device.features());
             app.insert_resource(device.clone())
@@ -290,12 +291,17 @@ impl Plugin for RenderPlugin {
         }
 
         app.add_plugin(WindowRenderPlugin)
+            .await
             .add_plugin(CameraPlugin)
+            .await
             .add_plugin(ViewPlugin)
+            .await
             .add_plugin(MeshPlugin)
+            .await
             // NOTE: Load this after renderer initialization so that it knows about the supported
             // compressed texture formats
-            .add_plugin(ImagePlugin);
+            .add_plugin(ImagePlugin)
+            .await;
     }
 }
 
diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs
index 156e44de8da64..790898ed7e3be 100644
--- a/crates/bevy_render/src/mesh/mod.rs
+++ b/crates/bevy_render/src/mesh/mod.rs
@@ -3,6 +3,7 @@ mod mesh;
 /// Generation for some primitive shape meshes.
 pub mod shape;
 
+use async_trait::async_trait;
 pub use mesh::*;
 
 use crate::render_asset::RenderAssetPlugin;
@@ -12,11 +13,13 @@ use bevy_asset::AddAsset;
 /// Adds the [`Mesh`] as an asset and makes sure that they are extracted and prepared for the GPU.
 pub struct MeshPlugin;
 
+#[async_trait]
 impl Plugin for MeshPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<Mesh>()
             .add_asset::<skinning::SkinnedMeshInverseBindposes>()
             .register_type::<skinning::SkinnedMesh>()
-            .add_plugin(RenderAssetPlugin::<Mesh>::default());
+            .add_plugin(RenderAssetPlugin::<Mesh>::default())
+            .await;
     }
 }
diff --git a/crates/bevy_render/src/render_asset.rs b/crates/bevy_render/src/render_asset.rs
index 22936f3e677be..b645788422896 100644
--- a/crates/bevy_render/src/render_asset.rs
+++ b/crates/bevy_render/src/render_asset.rs
@@ -1,4 +1,5 @@
 use crate::{RenderApp, RenderStage};
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_asset::{Asset, AssetEvent, Assets, Handle};
 use bevy_ecs::{
@@ -80,8 +81,9 @@ impl<A: RenderAsset> Default for RenderAssetPlugin<A> {
     }
 }
 
+#[async_trait]
 impl<A: RenderAsset> Plugin for RenderAssetPlugin<A> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             let prepare_asset_system = prepare_assets::<A>.label(self.prepare_asset_label.clone());
 
diff --git a/crates/bevy_render/src/render_resource/shader.rs b/crates/bevy_render/src/render_resource/shader.rs
index 475654e5a13d2..846d3d55faa0d 100644
--- a/crates/bevy_render/src/render_resource/shader.rs
+++ b/crates/bevy_render/src/render_resource/shader.rs
@@ -10,8 +10,10 @@ use std::{
     borrow::Cow, collections::HashSet, marker::Copy, ops::Deref, path::PathBuf, str::FromStr,
 };
 use thiserror::Error;
+#[cfg(feature = "spirv")]
+use wgpu::util::make_spirv;
 use wgpu::Features;
-use wgpu::{util::make_spirv, ShaderModuleDescriptor, ShaderSource};
+use wgpu::{ShaderModuleDescriptor, ShaderSource};
 
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 pub struct ShaderId(Uuid);
@@ -192,6 +194,9 @@ impl ProcessedShader {
                     let wgsl = reflection.get_wgsl()?;
                     ShaderSource::Wgsl(wgsl.into())
                 }
+                #[cfg(not(feature = "spirv"))]
+                ProcessedShader::SpirV(_source) => unimplemented!("spirv feature is not enabled"),
+                #[cfg(feature = "spirv")]
                 ProcessedShader::SpirV(source) => make_spirv(source),
             },
         })
@@ -364,6 +369,24 @@ impl ShaderImportProcessor {
 pub static SHADER_IMPORT_PROCESSOR: Lazy<ShaderImportProcessor> =
     Lazy::new(ShaderImportProcessor::default);
 
+pub struct WgslUpdater {
+    stage_regex: Regex,
+    location_regex: Regex,
+    builtin_regex: Regex,
+    binding_regex: Regex,
+}
+
+impl Default for WgslUpdater {
+    fn default() -> Self {
+        Self {
+            stage_regex: Regex::new(r"^\[\[stage\((\w*)\)\]\]$").unwrap(),
+            location_regex: Regex::new(r"\[\[location\((\d*)\)\]\]").unwrap(),
+            builtin_regex: Regex::new(r"\[\[builtin\((\w*)\)\]\]").unwrap(),
+            binding_regex: Regex::new(r"\[\[group\((\d*)\), binding\((\d*)\)\]\]").unwrap(),
+        }
+    }
+}
+
 pub struct ShaderProcessor {
     ifdef_regex: Regex,
     ifndef_regex: Regex,
@@ -390,8 +413,14 @@ impl ShaderProcessor {
         shaders: &HashMap<Handle<Shader>, Shader>,
         import_handles: &HashMap<ShaderImport, Handle<Shader>>,
     ) -> Result<ProcessedShader, ProcessShaderError> {
+        let mut updater = None;
         let shader_str = match &shader.source {
-            Source::Wgsl(source) => source.deref(),
+            Source::Wgsl(source) => {
+                if cfg!(feature = "webgpu") {
+                    updater = Some(WgslUpdater::default());
+                }
+                source.deref()
+            }
             Source::Glsl(source, _stage) => source.deref(),
             Source::SpirV(source) => {
                 if shader_defs.is_empty() {
@@ -457,7 +486,28 @@ impl ShaderProcessor {
                 {
                     // ignore import path lines
                 } else {
-                    final_string.push_str(line);
+                    if let Some(updater) = updater.as_ref() {
+                        if updater.stage_regex.is_match(line) {
+                            final_string.push_str(&updater.stage_regex.replace(line, "@$1"));
+                        } else if updater.location_regex.is_match(line) {
+                            final_string
+                                .push_str(&updater.location_regex.replace(line, "@location($1)"));
+                        } else if updater.builtin_regex.is_match(line) {
+                            final_string
+                                .push_str(&updater.builtin_regex.replace(line, "@builtin($1)"));
+                        } else if updater.binding_regex.is_match(line) {
+                            final_string.push_str(
+                                &updater
+                                    .binding_regex
+                                    .replace(line, "@group($1) @binding($2)"),
+                            );
+                        } else {
+                            final_string.push_str(line);
+                        }
+                    } else {
+                        final_string.push_str(line);
+                    }
+
                     final_string.push('\n');
                 }
             }
diff --git a/crates/bevy_render/src/texture/mod.rs b/crates/bevy_render/src/texture/mod.rs
index 1ca625d1a2cfc..b1460ff5e4d08 100644
--- a/crates/bevy_render/src/texture/mod.rs
+++ b/crates/bevy_render/src/texture/mod.rs
@@ -16,6 +16,7 @@ pub(crate) mod image_texture_conversion;
 pub use self::image::*;
 #[cfg(feature = "ktx2")]
 pub use self::ktx2::*;
+use async_trait::async_trait;
 #[cfg(feature = "dds")]
 pub use dds::*;
 #[cfg(feature = "hdr")]
@@ -36,8 +37,9 @@ use bevy_asset::{AddAsset, Assets};
 /// Adds the [`Image`] as an asset and makes sure that they are extracted and prepared for the GPU.
 pub struct ImagePlugin;
 
+#[async_trait]
 impl Plugin for ImagePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         #[cfg(any(
             feature = "png",
             feature = "dds",
@@ -59,6 +61,7 @@ impl Plugin for ImagePlugin {
         app.add_plugin(RenderAssetPlugin::<Image>::with_prepare_asset_label(
             PrepareAssetLabel::PreAssetPrepare,
         ))
+        .await
         .add_asset::<Image>();
         app.world
             .resource_mut::<Assets<Image>>()
@@ -116,9 +119,11 @@ pub trait BevyDefault {
 
 impl BevyDefault for wgpu::TextureFormat {
     fn bevy_default() -> Self {
-        if cfg!(target_os = "android") || cfg!(target_arch = "wasm32") {
+        if cfg!(target_os = "android") || cfg!(feature = "webgl") {
             // Bgra8UnormSrgb texture missing on some Android devices
             wgpu::TextureFormat::Rgba8UnormSrgb
+        } else if cfg!(feature = "webgpu") {
+            wgpu::TextureFormat::Bgra8Unorm
         } else {
             wgpu::TextureFormat::Bgra8UnormSrgb
         }
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 2638e94d4581a..96df059639587 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -1,6 +1,7 @@
 pub mod visibility;
 pub mod window;
 
+use async_trait::async_trait;
 pub use visibility::*;
 use wgpu::{
     Color, Extent3d, Operations, RenderPassColorAttachment, TextureDescriptor, TextureDimension,
@@ -26,12 +27,15 @@ use bevy_utils::HashMap;
 
 pub struct ViewPlugin;
 
+#[async_trait]
 impl Plugin for ViewPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_resource::<Msaa>()
             // NOTE: windows.is_changed() handles cases where a window was resized
             .add_plugin(ExtractResourcePlugin::<Msaa>::default())
-            .add_plugin(VisibilityPlugin);
+            .await
+            .add_plugin(VisibilityPlugin)
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs
index 4f8a456486a19..ef187f8975b07 100644
--- a/crates/bevy_render/src/view/visibility/mod.rs
+++ b/crates/bevy_render/src/view/visibility/mod.rs
@@ -1,5 +1,6 @@
 mod render_layers;
 
+use async_trait::async_trait;
 use bevy_math::Vec3A;
 pub use render_layers::*;
 
@@ -79,8 +80,9 @@ pub enum VisibilitySystems {
 
 pub struct VisibilityPlugin;
 
+#[async_trait]
 impl Plugin for VisibilityPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         use VisibilitySystems::*;
 
         app.add_system_to_stage(
diff --git a/crates/bevy_render/src/view/window.rs b/crates/bevy_render/src/view/window.rs
index 305a56ddd115b..d36c7159ad166 100644
--- a/crates/bevy_render/src/view/window.rs
+++ b/crates/bevy_render/src/view/window.rs
@@ -4,6 +4,7 @@ use crate::{
     texture::BevyDefault,
     RenderApp, RenderStage, RenderWorld,
 };
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_ecs::prelude::*;
 use bevy_utils::{tracing::debug, HashMap, HashSet};
@@ -22,8 +23,9 @@ pub enum WindowSystem {
     Prepare,
 }
 
+#[async_trait]
 impl Plugin for WindowRenderPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
                 .init_resource::<ExtractedWindows>()
diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml
index 49313b486b37b..6a3a14d133a55 100644
--- a/crates/bevy_scene/Cargo.toml
+++ b/crates/bevy_scene/Cargo.toml
@@ -25,3 +25,4 @@ ron = "0.7.0"
 uuid = { version = "1.1", features = ["v4", "serde"] }
 anyhow = "1.0.4"
 thiserror = "1.0"
+async-trait = "0.1"
diff --git a/crates/bevy_scene/src/lib.rs b/crates/bevy_scene/src/lib.rs
index bf51a8fc7b7e2..901671804fb55 100644
--- a/crates/bevy_scene/src/lib.rs
+++ b/crates/bevy_scene/src/lib.rs
@@ -5,6 +5,7 @@ mod scene_loader;
 mod scene_spawner;
 pub mod serde;
 
+use async_trait::async_trait;
 pub use bundle::*;
 pub use dynamic_scene::*;
 pub use scene::*;
@@ -23,8 +24,9 @@ use bevy_ecs::{schedule::ExclusiveSystemDescriptorCoercion, system::IntoExclusiv
 #[derive(Default)]
 pub struct ScenePlugin;
 
+#[async_trait]
 impl Plugin for ScenePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<DynamicScene>()
             .add_asset::<Scene>()
             .init_asset_loader::<SceneLoader>()
diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml
index 238fe048b2f37..910b22e081f2b 100644
--- a/crates/bevy_sprite/Cargo.toml
+++ b/crates/bevy_sprite/Cargo.toml
@@ -31,3 +31,4 @@ rectangle-pack = "0.4"
 serde = { version = "1", features = ["derive"] }
 bitflags = "1.2"
 copyless = "0.1.5"
+async-trait = "0.1"
diff --git a/crates/bevy_sprite/src/lib.rs b/crates/bevy_sprite/src/lib.rs
index a7be1a4ab983b..585572df76772 100644
--- a/crates/bevy_sprite/src/lib.rs
+++ b/crates/bevy_sprite/src/lib.rs
@@ -19,6 +19,7 @@ pub mod prelude {
     };
 }
 
+use async_trait::async_trait;
 pub use bundle::*;
 pub use dynamic_texture_atlas_builder::*;
 pub use mesh2d::*;
@@ -50,8 +51,9 @@ pub enum SpriteSystem {
     ExtractSprites,
 }
 
+#[async_trait]
 impl Plugin for SpritePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let mut shaders = app.world.resource_mut::<Assets<Shader>>();
         let sprite_shader = Shader::from_wgsl(include_str!("render/sprite.wgsl"));
         shaders.set_untracked(SPRITE_SHADER_HANDLE, sprite_shader);
@@ -59,7 +61,9 @@ impl Plugin for SpritePlugin {
             .register_type::<Sprite>()
             .register_type::<Mesh2dHandle>()
             .add_plugin(Mesh2dRenderPlugin)
-            .add_plugin(ColorMaterialPlugin);
+            .await
+            .add_plugin(ColorMaterialPlugin)
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
diff --git a/crates/bevy_sprite/src/mesh2d/color_material.rs b/crates/bevy_sprite/src/mesh2d/color_material.rs
index 0721b1a0a607d..33cef94321c84 100644
--- a/crates/bevy_sprite/src/mesh2d/color_material.rs
+++ b/crates/bevy_sprite/src/mesh2d/color_material.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_asset::{load_internal_asset, AssetServer, Assets, Handle, HandleUntyped};
 use bevy_ecs::system::{lifetimeless::SRes, SystemParamItem};
@@ -20,8 +21,9 @@ pub const COLOR_MATERIAL_SHADER_HANDLE: HandleUntyped =
 #[derive(Default)]
 pub struct ColorMaterialPlugin;
 
+#[async_trait]
 impl Plugin for ColorMaterialPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         load_internal_asset!(
             app,
             COLOR_MATERIAL_SHADER_HANDLE,
@@ -29,7 +31,8 @@ impl Plugin for ColorMaterialPlugin {
             Shader::from_wgsl
         );
 
-        app.add_plugin(Material2dPlugin::<ColorMaterial>::default());
+        app.add_plugin(Material2dPlugin::<ColorMaterial>::default())
+            .await;
 
         app.world
             .resource_mut::<Assets<ColorMaterial>>()
diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs
index 9ed1ce540757b..8c8e61c28b5d1 100644
--- a/crates/bevy_sprite/src/mesh2d/material.rs
+++ b/crates/bevy_sprite/src/mesh2d/material.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_asset::{AddAsset, Asset, AssetServer, Handle};
 use bevy_core_pipeline::core_2d::Transparent2d;
@@ -191,11 +192,14 @@ impl<M: SpecializedMaterial2d> Default for Material2dPlugin<M> {
     }
 }
 
+#[async_trait]
 impl<M: SpecializedMaterial2d> Plugin for Material2dPlugin<M> {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<M>()
             .add_plugin(ExtractComponentPlugin::<Handle<M>>::extract_visible())
-            .add_plugin(RenderAssetPlugin::<M>::default());
+            .await
+            .add_plugin(RenderAssetPlugin::<M>::default())
+            .await;
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
                 .add_render_command::<Transparent2d, DrawMaterial2d<M>>()
diff --git a/crates/bevy_sprite/src/mesh2d/mesh.rs b/crates/bevy_sprite/src/mesh2d/mesh.rs
index 7a6ebfeadff93..322693266413c 100644
--- a/crates/bevy_sprite/src/mesh2d/mesh.rs
+++ b/crates/bevy_sprite/src/mesh2d/mesh.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use bevy_app::Plugin;
 use bevy_asset::{load_internal_asset, Handle, HandleUntyped};
 use bevy_ecs::{
@@ -50,8 +51,9 @@ pub const MESH2D_FUNCTIONS_HANDLE: HandleUntyped =
 pub const MESH2D_SHADER_HANDLE: HandleUntyped =
     HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 2971387252468633715);
 
+#[async_trait]
 impl Plugin for Mesh2dRenderPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
+    async fn build(&self, app: &mut bevy_app::App) {
         load_internal_asset!(
             app,
             MESH2D_VIEW_TYPES_HANDLE,
@@ -84,7 +86,8 @@ impl Plugin for Mesh2dRenderPlugin {
         );
         load_internal_asset!(app, MESH2D_SHADER_HANDLE, "mesh2d.wgsl", Shader::from_wgsl);
 
-        app.add_plugin(UniformComponentPlugin::<Mesh2dUniform>::default());
+        app.add_plugin(UniformComponentPlugin::<Mesh2dUniform>::default())
+            .await;
 
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app
diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml
index d668108ea6850..a5070cb83c6d0 100644
--- a/crates/bevy_text/Cargo.toml
+++ b/crates/bevy_text/Cargo.toml
@@ -30,3 +30,4 @@ ab_glyph = "0.2.6"
 glyph_brush_layout = "0.2.1"
 thiserror = "1.0"
 serde = {version = "1", features = ["derive"]}
+async-trait = "0.1"
diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs
index 4dc1fc3b34070..ed001a9a70959 100644
--- a/crates/bevy_text/src/lib.rs
+++ b/crates/bevy_text/src/lib.rs
@@ -8,6 +8,7 @@ mod pipeline;
 mod text;
 mod text2d;
 
+use async_trait::async_trait;
 pub use error::*;
 pub use font::*;
 pub use font_atlas::*;
@@ -38,8 +39,9 @@ pub type DefaultTextPipeline = TextPipeline<Entity>;
 #[derive(Default)]
 pub struct TextPlugin;
 
+#[async_trait]
 impl Plugin for TextPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_asset::<Font>()
             .add_asset::<FontAtlasSet>()
             .register_type::<Text>()
diff --git a/crates/bevy_time/Cargo.toml b/crates/bevy_time/Cargo.toml
index b1b2c03ff8bf7..b1322c1988f2e 100644
--- a/crates/bevy_time/Cargo.toml
+++ b/crates/bevy_time/Cargo.toml
@@ -15,3 +15,6 @@ bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev", features = ["bevy_reflect"] }
 bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev", features = ["bevy"] }
 bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
+
+# other
+async-trait = "0.1"
diff --git a/crates/bevy_time/src/lib.rs b/crates/bevy_time/src/lib.rs
index dc1f48552031c..c1f9ea956369c 100644
--- a/crates/bevy_time/src/lib.rs
+++ b/crates/bevy_time/src/lib.rs
@@ -4,6 +4,7 @@ mod stopwatch;
 mod time;
 mod timer;
 
+use async_trait::async_trait;
 pub use fixed_timestep::*;
 pub use stopwatch::*;
 pub use time::*;
@@ -27,8 +28,9 @@ pub struct TimePlugin;
 /// this.
 pub struct TimeSystem;
 
+#[async_trait]
 impl Plugin for TimePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_resource::<Time>()
             .init_resource::<FixedTimesteps>()
             .register_type::<Timer>()
diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml
index 6a85ed46064e5..3445ac6cd96be 100644
--- a/crates/bevy_transform/Cargo.toml
+++ b/crates/bevy_transform/Cargo.toml
@@ -15,3 +15,6 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev", features = ["bevy_refl
 bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.8.0-dev"}
 bevy_math = { path = "../bevy_math", version = "0.8.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev", features = ["bevy"] }
+
+# other
+async-trait = "0.1"
diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs
index a88017c7d7d60..d05645772432d 100644
--- a/crates/bevy_transform/src/lib.rs
+++ b/crates/bevy_transform/src/lib.rs
@@ -12,6 +12,7 @@ pub mod prelude {
     pub use crate::{components::*, TransformBundle, TransformPlugin};
 }
 
+use async_trait::async_trait;
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_hierarchy::HierarchySystem;
@@ -88,8 +89,9 @@ pub enum TransformSystem {
 #[derive(Default)]
 pub struct TransformPlugin;
 
+#[async_trait]
 impl Plugin for TransformPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.register_type::<Transform>()
             .register_type::<GlobalTransform>()
             // Adding these to startup ensures the first update is "correct"
diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml
index 968a14a53da9f..adc1c35fb9f12 100644
--- a/crates/bevy_ui/Cargo.toml
+++ b/crates/bevy_ui/Cargo.toml
@@ -32,3 +32,4 @@ stretch = "0.3.2"
 serde = { version = "1", features = ["derive"] }
 smallvec = { version = "1.6", features = ["union", "const_generics"] }
 bytemuck = { version = "1.5", features = ["derive"] }
+async-trait = "0.1"
diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
index 135cca188eb49..6679e2c8052ca 100644
--- a/crates/bevy_ui/src/lib.rs
+++ b/crates/bevy_ui/src/lib.rs
@@ -12,6 +12,7 @@ pub mod entity;
 pub mod update;
 pub mod widget;
 
+use async_trait::async_trait;
 use bevy_render::extract_component::ExtractComponentPlugin;
 pub use flex::*;
 pub use focus::*;
@@ -48,9 +49,11 @@ pub enum UiSystem {
     Focus,
 }
 
+#[async_trait]
 impl Plugin for UiPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_plugin(ExtractComponentPlugin::<CameraUi>::default())
+            .await
             .init_resource::<FlexSurface>()
             .register_type::<AlignContent>()
             .register_type::<AlignItems>()
diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml
index f77605cc76c80..7a9c8ddcba572 100644
--- a/crates/bevy_window/Cargo.toml
+++ b/crates/bevy_window/Cargo.toml
@@ -19,6 +19,7 @@ bevy_input = { path = "../bevy_input", version = "0.8.0-dev" }
 raw-window-handle = "0.4.2"
 
 # other
+async-trait = "0.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = "0.3"
diff --git a/crates/bevy_window/src/lib.rs b/crates/bevy_window/src/lib.rs
index 6e5b2abd87680..d6ae99dcba236 100644
--- a/crates/bevy_window/src/lib.rs
+++ b/crates/bevy_window/src/lib.rs
@@ -6,6 +6,7 @@ mod window;
 mod windows;
 
 pub use crate::raw_window_handle::*;
+use async_trait::async_trait;
 pub use cursor::*;
 pub use event::*;
 pub use system::*;
@@ -56,8 +57,9 @@ impl Default for WindowPlugin {
     }
 }
 
+#[async_trait]
 impl Plugin for WindowPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_event::<WindowResized>()
             .add_event::<CreateWindow>()
             .add_event::<WindowCreated>()
diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml
index e896dd6c400be..a332ab2183442 100644
--- a/crates/bevy_winit/Cargo.toml
+++ b/crates/bevy_winit/Cargo.toml
@@ -25,6 +25,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 winit = { version = "0.26.0", default-features = false }
 approx = { version = "0.5.0", default-features = false }
 raw-window-handle = "0.4.2"
+async-trait = "0.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 winit = { version = "0.26.0", default-features = false }
diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
index 88e3f81126bea..7eb6f3bcbd17c 100644
--- a/crates/bevy_winit/src/lib.rs
+++ b/crates/bevy_winit/src/lib.rs
@@ -4,6 +4,7 @@ mod web_resize;
 mod winit_config;
 mod winit_windows;
 
+use async_trait::async_trait;
 pub use winit_config::*;
 pub use winit_windows::*;
 
@@ -39,14 +40,15 @@ use winit::{
 #[derive(Default)]
 pub struct WinitPlugin;
 
+#[async_trait]
 impl Plugin for WinitPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_non_send_resource::<WinitWindows>()
             .init_resource::<WinitSettings>()
             .set_runner(winit_runner)
             .add_system_to_stage(CoreStage::PostUpdate, change_window.label(ModifiesWindows));
         #[cfg(target_arch = "wasm32")]
-        app.add_plugin(web_resize::CanvasParentResizePlugin);
+        app.add_plugin(web_resize::CanvasParentResizePlugin).await;
         let event_loop = EventLoop::new();
         let mut create_window_reader = WinitCreateWindowReader::default();
         // Note that we create a window here "early" because WASM/WebGL requires the window to exist prior to initializing
diff --git a/crates/bevy_winit/src/web_resize.rs b/crates/bevy_winit/src/web_resize.rs
index 637dc06e0eaed..20fa760e62c6c 100644
--- a/crates/bevy_winit/src/web_resize.rs
+++ b/crates/bevy_winit/src/web_resize.rs
@@ -1,4 +1,5 @@
 use crate::WinitWindows;
+use async_trait::async_trait;
 use bevy_app::{App, Plugin};
 use bevy_ecs::prelude::*;
 use bevy_window::WindowId;
@@ -8,8 +9,9 @@ use winit::dpi::LogicalSize;
 
 pub(crate) struct CanvasParentResizePlugin;
 
+#[async_trait]
 impl Plugin for CanvasParentResizePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.init_resource::<CanvasParentResizeEventChannel>()
             .add_system(canvas_parent_resize_event_handler);
     }
diff --git a/errors/B0001.md b/errors/B0001.md
index 8c24a57c125d1..531b743b99be7 100644
--- a/errors/B0001.md
+++ b/errors/B0001.md
@@ -20,9 +20,11 @@ fn move_enemies_to_player(
     // ...
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(move_enemies_to_player)
         .run();
 }
@@ -52,9 +54,11 @@ fn move_enemies_to_player(
     // ...
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(move_enemies_to_player)
         .run();
 }
@@ -82,9 +86,11 @@ fn move_enemies_to_player(
     // ...
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(move_enemies_to_player)
         .run();
 }
diff --git a/errors/B0002.md b/errors/B0002.md
index 9f4df610afea1..858fde4f9d92f 100644
--- a/errors/B0002.md
+++ b/errors/B0002.md
@@ -14,9 +14,11 @@ fn update_materials(
     // ...
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(update_materials)
         .run();
 }
@@ -35,9 +37,11 @@ fn update_materials(
     // ...
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(update_materials)
         .run();
 }
diff --git a/errors/Cargo.toml b/errors/Cargo.toml
index 07ad946b1a864..0bdce53403c20 100644
--- a/errors/Cargo.toml
+++ b/errors/Cargo.toml
@@ -8,3 +8,4 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 bevy = { path = ".." }
+futures-lite = "1.12"
diff --git a/examples/2d/mesh2d.rs b/examples/2d/mesh2d.rs
index c45b2aec2e079..42026153ed78e 100644
--- a/examples/2d/mesh2d.rs
+++ b/examples/2d/mesh2d.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs
index 2e6c9f6c479a7..90420bb025fd4 100644
--- a/examples/2d/mesh2d_manual.rs
+++ b/examples/2d/mesh2d_manual.rs
@@ -3,6 +3,7 @@
 //! It doesn't use the [`Material2d`] abstraction, but changes the vertex buffer to include vertex color.
 //! Check out the "mesh2d" example for simpler / higher level 2d meshes.
 
+use async_trait::async_trait;
 use bevy::{
     core_pipeline::core_2d::Transparent2d,
     prelude::*,
@@ -28,10 +29,13 @@ use bevy::{
     utils::FloatOrd,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(ColoredMesh2dPlugin)
+        .await
         .add_startup_system(star)
         .run();
 }
@@ -262,8 +266,9 @@ pub struct ColoredMesh2dPlugin;
 pub const COLORED_MESH2D_SHADER_HANDLE: HandleUntyped =
     HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 13828845428412094821);
 
+#[async_trait]
 impl Plugin for ColoredMesh2dPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         // Load our custom shader
         let mut shaders = app.world.resource_mut::<Assets<Shader>>();
         shaders.set_untracked(
diff --git a/examples/2d/mesh2d_vertex_color_texture.rs b/examples/2d/mesh2d_vertex_color_texture.rs
index de3ec5c4491a1..fec84393caf05 100644
--- a/examples/2d/mesh2d_vertex_color_texture.rs
+++ b/examples/2d/mesh2d_vertex_color_texture.rs
@@ -3,9 +3,11 @@
 
 use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/2d/move_sprite.rs b/examples/2d/move_sprite.rs
index 295d340f853e1..e3cdf00d50ff8 100644
--- a/examples/2d/move_sprite.rs
+++ b/examples/2d/move_sprite.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(sprite_movement)
         .run();
diff --git a/examples/2d/rotation.rs b/examples/2d/rotation.rs
index d38b911d23f4d..ee3a3e6c2b6d9 100644
--- a/examples/2d/rotation.rs
+++ b/examples/2d/rotation.rs
@@ -9,9 +9,11 @@ use bevy::{
 const TIME_STEP: f32 = 1.0 / 60.0;
 const BOUNDS: Vec2 = const_vec2!([1200.0, 640.0]);
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system_set(
             SystemSet::new()
diff --git a/examples/2d/shapes.rs b/examples/2d/shapes.rs
index b3f7c504b3c72..947f22aebf73f 100644
--- a/examples/2d/shapes.rs
+++ b/examples/2d/shapes.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/2d/sprite.rs b/examples/2d/sprite.rs
index eac15a94c35a9..752c58bd9534f 100644
--- a/examples/2d/sprite.rs
+++ b/examples/2d/sprite.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/2d/sprite_flipping.rs b/examples/2d/sprite_flipping.rs
index b77e18c2b5da1..571529b50998b 100644
--- a/examples/2d/sprite_flipping.rs
+++ b/examples/2d/sprite_flipping.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/2d/sprite_sheet.rs b/examples/2d/sprite_sheet.rs
index 4286b88a24737..43308b88aea0b 100644
--- a/examples/2d/sprite_sheet.rs
+++ b/examples/2d/sprite_sheet.rs
@@ -3,10 +3,12 @@
 
 use bevy::{prelude::*, render::texture::ImageSettings};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(ImageSettings::default_nearest()) // prevents blurry sprites
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(animate_sprite)
         .run();
diff --git a/examples/2d/text2d.rs b/examples/2d/text2d.rs
index f967501f71f13..7df6533266693 100644
--- a/examples/2d/text2d.rs
+++ b/examples/2d/text2d.rs
@@ -7,9 +7,11 @@
 
 use bevy::{prelude::*, text::Text2dBounds};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(animate_translation)
         .add_system(animate_rotation)
diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs
index 74599ab9295a5..fdd746d9e8984 100644
--- a/examples/2d/texture_atlas.rs
+++ b/examples/2d/texture_atlas.rs
@@ -3,11 +3,13 @@
 
 use bevy::{asset::LoadState, prelude::*, render::texture::ImageSettings};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .init_resource::<RpgSpriteHandles>()
         .insert_resource(ImageSettings::default_nearest()) // prevents blurry sprites
         .add_plugins(DefaultPlugins)
+        .await
         .add_state(AppState::Setup)
         .add_system_set(SystemSet::on_enter(AppState::Setup).with_system(load_textures))
         .add_system_set(SystemSet::on_update(AppState::Setup).with_system(check_textures))
diff --git a/examples/2d/transparency_2d.rs b/examples/2d/transparency_2d.rs
index 846fbb3ba50f0..5fe2e13734169 100644
--- a/examples/2d/transparency_2d.rs
+++ b/examples/2d/transparency_2d.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs
index e084acbf9febc..f47161a634f5c 100644
--- a/examples/3d/3d_scene.rs
+++ b/examples/3d/3d_scene.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs
index 10fff72614aa5..eea28752a50d0 100644
--- a/examples/3d/lighting.rs
+++ b/examples/3d/lighting.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(movement)
         .add_system(animate_light_direction)
diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs
index 6d29461808d2f..b39e94de26f02 100644
--- a/examples/3d/load_gltf.rs
+++ b/examples/3d/load_gltf.rs
@@ -2,13 +2,15 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(AmbientLight {
             color: Color::WHITE,
             brightness: 1.0 / 5.0f32,
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(animate_light_direction)
         .run();
diff --git a/examples/3d/msaa.rs b/examples/3d/msaa.rs
index 6d8a95170cfe8..f42a215ad746c 100644
--- a/examples/3d/msaa.rs
+++ b/examples/3d/msaa.rs
@@ -8,10 +8,12 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(Msaa { samples: 4 })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(cycle_msaa)
         .run();
diff --git a/examples/3d/orthographic.rs b/examples/3d/orthographic.rs
index e58964876f39e..14c199fbc8993 100644
--- a/examples/3d/orthographic.rs
+++ b/examples/3d/orthographic.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, render::camera::ScalingMode};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs
index b8a4c99237d0a..142a6113b16ab 100644
--- a/examples/3d/parenting.rs
+++ b/examples/3d/parenting.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(rotator_system)
         .run();
diff --git a/examples/3d/pbr.rs b/examples/3d/pbr.rs
index 49913252a95a3..1ffcfdc809528 100644
--- a/examples/3d/pbr.rs
+++ b/examples/3d/pbr.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/render_to_texture.rs b/examples/3d/render_to_texture.rs
index f9179d49b98a6..8537cc6d68620 100644
--- a/examples/3d/render_to_texture.rs
+++ b/examples/3d/render_to_texture.rs
@@ -12,9 +12,11 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(cube_rotator_system)
         .add_system(rotator_system)
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index 8273201643ebc..9f7fff9f18c8c 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -2,7 +2,8 @@
 
 use bevy::{input::mouse::MouseMotion, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     println!(
         "Controls:
     WSAD   - forward/back/strafe left/right
@@ -17,6 +18,7 @@ fn main() {
     );
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(adjust_point_light_biases)
         .add_system(toggle_light)
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
index 9ba7052dbb3ed..0392c1acb0659 100644
--- a/examples/3d/shadow_caster_receiver.rs
+++ b/examples/3d/shadow_caster_receiver.rs
@@ -5,7 +5,8 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     println!(
         "Controls:
     C      - toggle shadow casters (i.e. casters become not, and not casters become casters)
@@ -14,6 +15,7 @@ fn main() {
     );
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(toggle_light)
         .add_system(toggle_shadows)
diff --git a/examples/3d/shapes.rs b/examples/3d/shapes.rs
index 665fd1952f802..4190c2ceb5177 100644
--- a/examples/3d/shapes.rs
+++ b/examples/3d/shapes.rs
@@ -6,9 +6,11 @@ use bevy::{
     render::render_resource::{Extent3d, TextureDimension, TextureFormat},
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(rotate)
         .run();
diff --git a/examples/3d/spherical_area_lights.rs b/examples/3d/spherical_area_lights.rs
index ba6b94bacdd11..46178f99f8931 100644
--- a/examples/3d/spherical_area_lights.rs
+++ b/examples/3d/spherical_area_lights.rs
@@ -2,10 +2,12 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(ClearColor(Color::BLACK))
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/split_screen.rs b/examples/3d/split_screen.rs
index 70cc464ea2593..6b88c7f49aed3 100644
--- a/examples/3d/split_screen.rs
+++ b/examples/3d/split_screen.rs
@@ -7,9 +7,11 @@ use bevy::{
     window::{WindowId, WindowResized},
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(set_camera_viewports)
         .run();
diff --git a/examples/3d/texture.rs b/examples/3d/texture.rs
index c61ac2a316133..7d94c3eda4477 100644
--- a/examples/3d/texture.rs
+++ b/examples/3d/texture.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/transparency_3d.rs b/examples/3d/transparency_3d.rs
index 008c1db49145c..95eafa027c096 100644
--- a/examples/3d/transparency_3d.rs
+++ b/examples/3d/transparency_3d.rs
@@ -4,10 +4,12 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(Msaa { samples: 4 })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(fade_transparency)
         .run();
diff --git a/examples/3d/two_passes.rs b/examples/3d/two_passes.rs
index af83417a1298e..83af54cc0cb78 100644
--- a/examples/3d/two_passes.rs
+++ b/examples/3d/two_passes.rs
@@ -2,9 +2,11 @@
 
 use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/update_gltf_scene.rs b/examples/3d/update_gltf_scene.rs
index 69d2672c37979..bf1b3df09f5f1 100644
--- a/examples/3d/update_gltf_scene.rs
+++ b/examples/3d/update_gltf_scene.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(move_scene_entities)
         .run();
diff --git a/examples/3d/vertex_colors.rs b/examples/3d/vertex_colors.rs
index 8f9fdd3d3f7b9..eafa9f7bf9599 100644
--- a/examples/3d/vertex_colors.rs
+++ b/examples/3d/vertex_colors.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, render::mesh::VertexAttributeValues};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/3d/wireframe.rs b/examples/3d/wireframe.rs
index 84c6bccef81e1..35af13b0edd0c 100644
--- a/examples/3d/wireframe.rs
+++ b/examples/3d/wireframe.rs
@@ -6,14 +6,17 @@ use bevy::{
     render::{render_resource::WgpuFeatures, settings::WgpuSettings},
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WgpuSettings {
             features: WgpuFeatures::POLYGON_MODE_LINE,
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(WireframePlugin)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/android/android.rs b/examples/android/android.rs
index 8914232398a04..d41b6d9061169 100644
--- a/examples/android/android.rs
+++ b/examples/android/android.rs
@@ -1,10 +1,12 @@
+#![allow(dead_code)]
 use bevy::prelude::*;
 
 // the `bevy_main` proc_macro generates the required android boilerplate
 #[bevy_main]
-fn main() {
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs
index 533fd1677c562..85d36fce9d25f 100644
--- a/examples/animation/animated_fox.rs
+++ b/examples/animation/animated_fox.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(AmbientLight {
             color: Color::WHITE,
             brightness: 1.0,
diff --git a/examples/animation/animated_transform.rs b/examples/animation/animated_transform.rs
index 2f8cc9ec68498..45838fa6ce4f4 100644
--- a/examples/animation/animated_transform.rs
+++ b/examples/animation/animated_transform.rs
@@ -4,9 +4,11 @@ use std::f32::consts::{FRAC_PI_2, PI};
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(AmbientLight {
             color: Color::WHITE,
             brightness: 1.0,
diff --git a/examples/animation/custom_skinned_mesh.rs b/examples/animation/custom_skinned_mesh.rs
index cfdf6ebd3f5e8..6c6fc66fcdd67 100644
--- a/examples/animation/custom_skinned_mesh.rs
+++ b/examples/animation/custom_skinned_mesh.rs
@@ -13,9 +13,11 @@ use bevy::{
 };
 use rand::Rng;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(AmbientLight {
             brightness: 1.0,
             ..default()
diff --git a/examples/animation/gltf_skinned_mesh.rs b/examples/animation/gltf_skinned_mesh.rs
index aea6e6a4faf2b..3a66fa0bf8d9a 100644
--- a/examples/animation/gltf_skinned_mesh.rs
+++ b/examples/animation/gltf_skinned_mesh.rs
@@ -5,9 +5,11 @@ use std::f32::consts::PI;
 
 use bevy::{pbr::AmbientLight, prelude::*, render::mesh::skinning::SkinnedMesh};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(AmbientLight {
             brightness: 1.0,
             ..default()
diff --git a/examples/app/custom_loop.rs b/examples/app/custom_loop.rs
index f9f1e607e2592..8effb0385f802 100644
--- a/examples/app/custom_loop.rs
+++ b/examples/app/custom_loop.rs
@@ -21,7 +21,8 @@ fn print_system(input: Res<Input>) {
     println!("You typed: {}", input.0);
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(Input(String::new()))
         .set_runner(my_runner)
diff --git a/examples/app/drag_and_drop.rs b/examples/app/drag_and_drop.rs
index 6dc64d50d3678..b1afa1c34155b 100644
--- a/examples/app/drag_and_drop.rs
+++ b/examples/app/drag_and_drop.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(file_drag_and_drop_system)
         .run();
 }
diff --git a/examples/app/empty.rs b/examples/app/empty.rs
index 758ff94555c16..1efd2d2a52f26 100644
--- a/examples/app/empty.rs
+++ b/examples/app/empty.rs
@@ -2,6 +2,7 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new().run();
 }
diff --git a/examples/app/empty_defaults.rs b/examples/app/empty_defaults.rs
index 445ed9fa3ad0d..6deaf9478118d 100644
--- a/examples/app/empty_defaults.rs
+++ b/examples/app/empty_defaults.rs
@@ -2,6 +2,7 @@
 
 use bevy::prelude::*;
 
-fn main() {
-    App::new().add_plugins(DefaultPlugins).run();
+#[bevy_main]
+async fn main() {
+    App::new().add_plugins(DefaultPlugins).await.run();
 }
diff --git a/examples/app/headless.rs b/examples/app/headless.rs
index 2b3451647ee19..74fa23e5efb92 100644
--- a/examples/app/headless.rs
+++ b/examples/app/headless.rs
@@ -8,11 +8,13 @@
 
 use bevy::{app::ScheduleRunnerSettings, prelude::*, utils::Duration};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     // this app runs once
     App::new()
         .insert_resource(ScheduleRunnerSettings::run_once())
         .add_plugins(MinimalPlugins)
+        .await
         .add_system(hello_world_system)
         .run();
 
@@ -22,6 +24,7 @@ fn main() {
             1.0 / 60.0,
         )))
         .add_plugins(MinimalPlugins)
+        .await
         .add_system(counter)
         .run();
 }
diff --git a/examples/app/headless_defaults.rs b/examples/app/headless_defaults.rs
index 72dbeba5ea383..499972842795f 100644
--- a/examples/app/headless_defaults.rs
+++ b/examples/app/headless_defaults.rs
@@ -3,12 +3,14 @@
 
 use bevy::{prelude::*, render::settings::WgpuSettings};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WgpuSettings {
             backends: None,
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .run();
 }
diff --git a/examples/app/logs.rs b/examples/app/logs.rs
index 029637b608eef..c55ce8390ed3a 100644
--- a/examples/app/logs.rs
+++ b/examples/app/logs.rs
@@ -2,7 +2,8 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // Uncomment this to override the default log settings:
         // .insert_resource(bevy::log::LogSettings {
@@ -10,6 +11,7 @@ fn main() {
         //     filter: "wgpu=warn,bevy_ecs=info".to_string(),
         // })
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(log_system)
         .run();
 }
diff --git a/examples/app/plugin.rs b/examples/app/plugin.rs
index e154ecd236a33..df9edfd7140f5 100644
--- a/examples/app/plugin.rs
+++ b/examples/app/plugin.rs
@@ -4,16 +4,20 @@
 //! that provide a specific piece of functionality (generally the smaller the scope, the better).
 //! This example illustrates how to create a simple plugin that prints out a message.
 
+use async_trait::async_trait;
 use bevy::{prelude::*, utils::Duration};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // plugins are registered as part of the "app building" process
         .add_plugin(PrintMessagePlugin {
             wait_duration: Duration::from_secs(1),
             message: "This is an example plugin".to_string(),
         })
+        .await
         .run();
 }
 
@@ -24,9 +28,10 @@ pub struct PrintMessagePlugin {
     message: String,
 }
 
+#[async_trait]
 impl Plugin for PrintMessagePlugin {
     // this is where we set up our plugin
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let state = PrintMessageState {
             message: self.message.clone(),
             timer: Timer::new(self.wait_duration, true),
diff --git a/examples/app/plugin_group.rs b/examples/app/plugin_group.rs
index 5eb4a27a7cd02..ee68bde0c285f 100644
--- a/examples/app/plugin_group.rs
+++ b/examples/app/plugin_group.rs
@@ -1,14 +1,18 @@
 //! Demonstrates the creation and registration of a custom plugin group.
 //! [`PluginGroup`]s are a way to group sets of plugins that should be registered together.
 
+use async_trait::async_trait;
 use bevy::{app::PluginGroupBuilder, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // Two PluginGroups that are included with bevy are DefaultPlugins and MinimalPlugins
         .add_plugins(DefaultPlugins)
+        .await
         // Adding a plugin group adds all plugins in the group by default
         .add_plugins(HelloWorldPlugins)
+        .await
         // You can also modify a PluginGroup (such as disabling plugins) like this:
         // .add_plugins_with(HelloWorldPlugins, |group| {
         //     group
@@ -29,8 +33,9 @@ impl PluginGroup for HelloWorldPlugins {
 
 pub struct PrintHelloPlugin;
 
+#[async_trait]
 impl Plugin for PrintHelloPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_system(print_hello_system);
     }
 }
@@ -41,8 +46,9 @@ fn print_hello_system() {
 
 pub struct PrintWorldPlugin;
 
+#[async_trait]
 impl Plugin for PrintWorldPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         app.add_system(print_world_system);
     }
 }
diff --git a/examples/app/return_after_run.rs b/examples/app/return_after_run.rs
index d1ef945390083..907e619418a05 100644
--- a/examples/app/return_after_run.rs
+++ b/examples/app/return_after_run.rs
@@ -2,7 +2,8 @@
 
 use bevy::{prelude::*, winit::WinitSettings};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     println!("Running first App.");
     App::new()
         .insert_resource(WinitSettings {
@@ -11,6 +12,7 @@ fn main() {
         })
         .insert_resource(ClearColor(Color::rgb(0.2, 0.2, 0.8)))
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(system1)
         .run();
     println!("Running another App.");
@@ -23,6 +25,7 @@ fn main() {
         .add_plugins_with(DefaultPlugins, |group| {
             group.disable::<bevy::log::LogPlugin>()
         })
+        .await
         .add_system(system2)
         .run();
     println!("Done.");
diff --git a/examples/app/thread_pool_resources.rs b/examples/app/thread_pool_resources.rs
index e49ab1636c621..bb5ffd2a6b74e 100644
--- a/examples/app/thread_pool_resources.rs
+++ b/examples/app/thread_pool_resources.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(DefaultTaskPoolOptions::with_num_threads(4))
         .add_plugins(DefaultPlugins)
+        .await
         .run();
 }
diff --git a/examples/app/without_winit.rs b/examples/app/without_winit.rs
index 4712f39c4476e..b63ea928f5eb3 100644
--- a/examples/app/without_winit.rs
+++ b/examples/app/without_winit.rs
@@ -3,9 +3,11 @@
 use bevy::prelude::*;
 use bevy::winit::WinitPlugin;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins_with(DefaultPlugins, |group| group.disable::<WinitPlugin>())
+        .await
         .add_system(setup_system)
         .run();
 }
diff --git a/examples/asset/asset_loading.rs b/examples/asset/asset_loading.rs
index 59aec1dbcca76..2adad481a502a 100644
--- a/examples/asset/asset_loading.rs
+++ b/examples/asset/asset_loading.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/asset/custom_asset.rs b/examples/asset/custom_asset.rs
index 3462f3e511e64..a8f85259bc096 100644
--- a/examples/asset/custom_asset.rs
+++ b/examples/asset/custom_asset.rs
@@ -35,9 +35,11 @@ impl AssetLoader for CustomAssetLoader {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .init_resource::<State>()
         .add_asset::<CustomAsset>()
         .init_asset_loader::<CustomAssetLoader>()
diff --git a/examples/asset/custom_asset_io.rs b/examples/asset/custom_asset_io.rs
index 7a58750a1cbfa..68e0de32809d4 100644
--- a/examples/asset/custom_asset_io.rs
+++ b/examples/asset/custom_asset_io.rs
@@ -2,6 +2,7 @@
 //! An [`AssetIo`] is what the asset server uses to read the raw bytes of assets.
 //! It does not know anything about the asset formats, only how to talk to the underlying storage.
 
+use async_trait::async_trait;
 use bevy::{
     asset::{AssetIo, AssetIoError, Metadata},
     prelude::*,
@@ -49,8 +50,9 @@ impl AssetIo for CustomAssetIo {
 /// A plugin used to execute the override of the asset io
 struct CustomAssetIoPlugin;
 
+#[async_trait]
 impl Plugin for CustomAssetIoPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let asset_io = {
             // the platform default asset io requires a reference to the app
             // builder to find its configuration
@@ -68,7 +70,8 @@ impl Plugin for CustomAssetIoPlugin {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins_with(DefaultPlugins, |group| {
             // the custom asset io plugin must be inserted in-between the
@@ -80,6 +83,7 @@ fn main() {
             // asset system are initialized correctly.
             group.add_before::<bevy::asset::AssetPlugin, _>(CustomAssetIoPlugin)
         })
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/asset/hot_asset_reloading.rs b/examples/asset/hot_asset_reloading.rs
index d96af65e59e65..ca5cb84b528fa 100644
--- a/examples/asset/hot_asset_reloading.rs
+++ b/examples/asset/hot_asset_reloading.rs
@@ -4,7 +4,8 @@
 
 use bevy::{asset::AssetServerSettings, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // Tell the asset server to watch for asset changes on disk:
         .insert_resource(AssetServerSettings {
@@ -12,6 +13,7 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/async_tasks/async_compute.rs b/examples/async_tasks/async_compute.rs
index e01ebd4c9bcd7..68cbd2c663ba8 100644
--- a/examples/async_tasks/async_compute.rs
+++ b/examples/async_tasks/async_compute.rs
@@ -9,9 +9,11 @@ use futures_lite::future;
 use rand::Rng;
 use std::time::{Duration, Instant};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup_env)
         .add_startup_system(add_assets)
         .add_startup_system(spawn_tasks)
diff --git a/examples/async_tasks/external_source_external_thread.rs b/examples/async_tasks/external_source_external_thread.rs
index cec5ed959a56a..4899a666257b1 100644
--- a/examples/async_tasks/external_source_external_thread.rs
+++ b/examples/async_tasks/external_source_external_thread.rs
@@ -6,10 +6,12 @@ use crossbeam_channel::{bounded, Receiver};
 use rand::Rng;
 use std::time::{Duration, Instant};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_event::<StreamEvent>()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(read_stream)
         .add_system(spawn_text)
diff --git a/examples/audio/audio.rs b/examples/audio/audio.rs
index 82d5d01fadacb..2ab8628f8de6c 100644
--- a/examples/audio/audio.rs
+++ b/examples/audio/audio.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs
index e5f0728516af8..10665c06b7b6f 100644
--- a/examples/audio/audio_control.rs
+++ b/examples/audio/audio_control.rs
@@ -2,9 +2,11 @@
 
 use bevy::{audio::AudioSink, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(update_speed)
         .add_system(pause)
diff --git a/examples/diagnostics/custom_diagnostic.rs b/examples/diagnostics/custom_diagnostic.rs
index 7e7dc1b095873..bb7c72f59bb1b 100644
--- a/examples/diagnostics/custom_diagnostic.rs
+++ b/examples/diagnostics/custom_diagnostic.rs
@@ -5,12 +5,15 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // The "print diagnostics" plugin is optional.
         // It just visualizes our diagnostics in the console.
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .add_startup_system(setup_diagnostic_system)
         .add_system(my_system)
         .run();
diff --git a/examples/diagnostics/log_diagnostics.rs b/examples/diagnostics/log_diagnostics.rs
index 3af2af71df870..fcaedb709ef17 100644
--- a/examples/diagnostics/log_diagnostics.rs
+++ b/examples/diagnostics/log_diagnostics.rs
@@ -5,17 +5,21 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // Adds frame time diagnostics
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         // Adds a system that prints diagnostics to the console
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         // Any plugin can register diagnostics
         // Uncomment this to add an entity count diagnostics:
-        // .add_plugin(bevy::diagnostic::EntityCountDiagnosticsPlugin::default())
+        // .add_plugin(bevy::diagnostic::EntityCountDiagnosticsPlugin::default()).await
         // Uncomment this to add an asset count diagnostics:
-        // .add_plugin(bevy::asset::diagnostic::AssetCountDiagnosticsPlugin::<Texture>::default())
+        // .add_plugin(bevy::asset::diagnostic::AssetCountDiagnosticsPlugin::<Texture>::default()).await
         .run();
 }
diff --git a/examples/ecs/component_change_detection.rs b/examples/ecs/component_change_detection.rs
index 68e18a58469d8..128abff021d3d 100644
--- a/examples/ecs/component_change_detection.rs
+++ b/examples/ecs/component_change_detection.rs
@@ -3,9 +3,11 @@
 use bevy::prelude::*;
 use rand::Rng;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(change_component)
         .add_system(change_detection)
diff --git a/examples/ecs/custom_query_param.rs b/examples/ecs/custom_query_param.rs
index 4dd4f266d63ab..efe126ccd199c 100644
--- a/examples/ecs/custom_query_param.rs
+++ b/examples/ecs/custom_query_param.rs
@@ -18,7 +18,8 @@ use bevy::{
 };
 use std::fmt::Debug;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_startup_system(spawn)
         .add_system(print_components_read_only)
diff --git a/examples/ecs/ecs_guide.rs b/examples/ecs/ecs_guide.rs
index 4bc0d527263ee..6646975c017fc 100644
--- a/examples/ecs/ecs_guide.rs
+++ b/examples/ecs/ecs_guide.rs
@@ -244,7 +244,8 @@ enum MyStage {
 }
 
 // Our Bevy app's entry point
-fn main() {
+#[bevy_main]
+async fn main() {
     // Bevy apps are created using the builder pattern. We use the builder to add systems,
     // resources, and plugins to our app
     App::new()
@@ -257,6 +258,7 @@ fn main() {
         // that :) The plugin below runs our app's "system schedule" once every 5 seconds
         // (configured above).
         .add_plugin(ScheduleRunnerPlugin::default())
+        .await
         // Startup systems run exactly once BEFORE all other systems. These are generally used for
         // app initialization code (ex: adding entities and resources)
         .add_startup_system(startup_system)
@@ -334,6 +336,7 @@ fn main() {
         // Be aware that not everything reported by this checker is a potential problem, you'll have
         // to make that judgement yourself.
         .add_plugin(LogPlugin::default())
+        .await
         .init_resource::<ReportExecutionOrderAmbiguities>()
         // This call to run() starts the app we just built!
         .run();
diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs
index f4c93c44d47a0..ab3d15a8edb15 100644
--- a/examples/ecs/event.rs
+++ b/examples/ecs/event.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_event::<MyEvent>()
         .add_event::<PlaySound>()
         .init_resource::<EventTriggerState>()
diff --git a/examples/ecs/fixed_timestep.rs b/examples/ecs/fixed_timestep.rs
index 0f58e7d531ee8..865b7852c80ed 100644
--- a/examples/ecs/fixed_timestep.rs
+++ b/examples/ecs/fixed_timestep.rs
@@ -10,9 +10,11 @@ const LABEL: &str = "my_fixed_timestep";
 #[derive(Debug, Hash, PartialEq, Eq, Clone, StageLabel)]
 struct FixedUpdateStage;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // this system will run once every update (it should match your screen's refresh rate)
         .add_system(frame_update)
         // add a new stage that runs twice a second
diff --git a/examples/ecs/generic_system.rs b/examples/ecs/generic_system.rs
index 0d3f3c31776d8..878d049d70bdc 100644
--- a/examples/ecs/generic_system.rs
+++ b/examples/ecs/generic_system.rs
@@ -29,9 +29,11 @@ struct MenuClose;
 #[derive(Component)]
 struct LevelUnload;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_state(AppState::MainMenu)
         .add_startup_system(setup_system)
         .add_system(print_text_system)
diff --git a/examples/ecs/hierarchy.rs b/examples/ecs/hierarchy.rs
index fcb5ee6f7011e..0818a6ee6c2c1 100644
--- a/examples/ecs/hierarchy.rs
+++ b/examples/ecs/hierarchy.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(rotate)
         .run();
diff --git a/examples/ecs/iter_combinations.rs b/examples/ecs/iter_combinations.rs
index 31f16325d78e1..7d1f445fc7636 100644
--- a/examples/ecs/iter_combinations.rs
+++ b/examples/ecs/iter_combinations.rs
@@ -8,9 +8,11 @@ struct FixedUpdateStage;
 
 const DELTA_TIME: f64 = 0.01;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(AmbientLight {
             brightness: 0.03,
             ..default()
diff --git a/examples/ecs/parallel_query.rs b/examples/ecs/parallel_query.rs
index 2ecebd5e2a31c..020f32adeefdc 100644
--- a/examples/ecs/parallel_query.rs
+++ b/examples/ecs/parallel_query.rs
@@ -61,9 +61,11 @@ fn bounce_system(windows: Res<Windows>, mut sprites: Query<(&Transform, &mut Vel
         });
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(spawn_system)
         .add_system(move_system)
         .add_system(bounce_system)
diff --git a/examples/ecs/removal_detection.rs b/examples/ecs/removal_detection.rs
index 0f3c6c7c100f7..f504ab24d05b1 100644
--- a/examples/ecs/removal_detection.rs
+++ b/examples/ecs/removal_detection.rs
@@ -2,7 +2,8 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     // Information regarding removed `Component`s is discarded at the end of each frame, so you need
     // to react to the removal before the frame is over.
     //
@@ -15,6 +16,7 @@ fn main() {
     // `CoreStage::PostUpdate` stage.
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system_to_stage(CoreStage::Update, remove_component)
         .add_system_to_stage(CoreStage::PostUpdate, react_on_removal)
diff --git a/examples/ecs/startup_system.rs b/examples/ecs/startup_system.rs
index f1a3e892cd3fa..f5af6c3a4c84b 100644
--- a/examples/ecs/startup_system.rs
+++ b/examples/ecs/startup_system.rs
@@ -2,7 +2,8 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_startup_system(startup_system)
         .add_system(normal_system)
diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
index ec3ed3a2f1046..ba51ecc21a5a0 100644
--- a/examples/ecs/state.rs
+++ b/examples/ecs/state.rs
@@ -3,9 +3,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_state(AppState::Menu)
         .add_startup_system(setup)
         .add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_menu))
diff --git a/examples/ecs/system_chaining.rs b/examples/ecs/system_chaining.rs
index 65b0401aa24e0..2520b5a6d9f17 100644
--- a/examples/ecs/system_chaining.rs
+++ b/examples/ecs/system_chaining.rs
@@ -4,7 +4,8 @@
 use anyhow::Result;
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(Message("42".to_string()))
         .add_system(parse_message_system.chain(handler_system))
diff --git a/examples/ecs/system_closure.rs b/examples/ecs/system_closure.rs
index 51612ba35cf35..27a4380dc7b71 100644
--- a/examples/ecs/system_closure.rs
+++ b/examples/ecs/system_closure.rs
@@ -2,7 +2,8 @@
 
 use bevy::{log::LogPlugin, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     // create a simple closure.
     let simple_closure = || {
         // this is a closure that does nothing.
@@ -26,6 +27,7 @@ fn main() {
 
     App::new()
         .add_plugin(LogPlugin)
+        .await
         // we can use a closure as a system
         .add_system(simple_closure)
         // or we can use a more complex closure, and pass an argument to initialize a Local variable.
diff --git a/examples/ecs/system_param.rs b/examples/ecs/system_param.rs
index 176caa716d629..90e670e4aa9b5 100644
--- a/examples/ecs/system_param.rs
+++ b/examples/ecs/system_param.rs
@@ -2,7 +2,8 @@
 
 use bevy::{ecs::system::SystemParam, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(PlayerCount(0))
         .add_startup_system(spawn)
diff --git a/examples/ecs/system_sets.rs b/examples/ecs/system_sets.rs
index e463c591e331e..d08f7a9a215b3 100644
--- a/examples/ecs/system_sets.rs
+++ b/examples/ecs/system_sets.rs
@@ -39,9 +39,11 @@ struct PostPhysics;
 #[derive(Default)]
 struct Done(bool);
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .init_resource::<Done>()
         // Note that the system sets added in this example set their run criteria explicitly.
         // See the `ecs/state.rs` example for a pattern where run criteria are set implicitly for common
diff --git a/examples/ecs/timers.rs b/examples/ecs/timers.rs
index 758c00bca292b..2ccc1ea42a312 100644
--- a/examples/ecs/timers.rs
+++ b/examples/ecs/timers.rs
@@ -2,9 +2,11 @@
 
 use bevy::{log::info, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .init_resource::<Countdown>()
         .add_startup_system(setup)
         .add_system(countdown)
diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs
index 24d3d657e2caf..7998533989ad8 100644
--- a/examples/games/alien_cake_addict.rs
+++ b/examples/games/alien_cake_addict.rs
@@ -9,10 +9,12 @@ enum GameState {
     GameOver,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .init_resource::<Game>()
         .add_plugins(DefaultPlugins)
+        .await
         .add_state(GameState::Playing)
         .add_startup_system(setup_cameras)
         .add_system_set(SystemSet::on_enter(GameState::Playing).with_system(setup))
diff --git a/examples/games/breakout.rs b/examples/games/breakout.rs
index 92391e43775df..0d47536cac981 100644
--- a/examples/games/breakout.rs
+++ b/examples/games/breakout.rs
@@ -52,9 +52,11 @@ const WALL_COLOR: Color = Color::rgb(0.8, 0.8, 0.8);
 const TEXT_COLOR: Color = Color::rgb(0.5, 0.5, 1.0);
 const SCORE_COLOR: Color = Color::rgb(1.0, 0.5, 0.5);
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(Scoreboard { score: 0 })
         .insert_resource(ClearColor(BACKGROUND_COLOR))
         .add_startup_system(setup)
diff --git a/examples/games/contributors.rs b/examples/games/contributors.rs
index ca0d513146235..74625280b48b8 100644
--- a/examples/games/contributors.rs
+++ b/examples/games/contributors.rs
@@ -8,9 +8,11 @@ use std::{
     process::Stdio,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup_contributor_selection)
         .add_startup_system(setup)
         .add_system(velocity_system)
diff --git a/examples/games/game_menu.rs b/examples/games/game_menu.rs
index f6c88c632a806..6cfbffee9f866 100644
--- a/examples/games/game_menu.rs
+++ b/examples/games/game_menu.rs
@@ -26,9 +26,11 @@ enum DisplayQuality {
 #[derive(Debug, Component, PartialEq, Eq, Clone, Copy)]
 struct Volume(u32);
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // Insert as resource the initial value for the settings resources
         .insert_resource(DisplayQuality::Medium)
         .insert_resource(Volume(7))
@@ -37,8 +39,11 @@ fn main() {
         .add_state(GameState::Splash)
         // Adds the plugins for each state
         .add_plugin(splash::SplashPlugin)
+        .await
         .add_plugin(menu::MenuPlugin)
+        .await
         .add_plugin(game::GamePlugin)
+        .await
         .run();
 }
 
@@ -47,6 +52,7 @@ fn setup(mut commands: Commands) {
 }
 
 mod splash {
+    use async_trait::async_trait;
     use bevy::prelude::*;
 
     use super::{despawn_screen, GameState};
@@ -54,8 +60,9 @@ mod splash {
     // This plugin will display a splash screen with Bevy logo for 1 second before switching to the menu
     pub struct SplashPlugin;
 
+    #[async_trait]
     impl Plugin for SplashPlugin {
-        fn build(&self, app: &mut App) {
+        async fn build(&self, app: &mut App) {
             // As this plugin is managing the splash screen, it will focus on the state `GameState::Splash`
             app
                 // When entering the state, spawn everything needed for this screen
@@ -111,6 +118,7 @@ mod splash {
 }
 
 mod game {
+    use async_trait::async_trait;
     use bevy::prelude::*;
 
     use super::{despawn_screen, DisplayQuality, GameState, Volume, TEXT_COLOR};
@@ -119,8 +127,9 @@ mod game {
     // display the current settings for 5 seconds before returning to the menu
     pub struct GamePlugin;
 
+    #[async_trait]
     impl Plugin for GamePlugin {
-        fn build(&self, app: &mut App) {
+        async fn build(&self, app: &mut App) {
             app.add_system_set(SystemSet::on_enter(GameState::Game).with_system(game_setup))
                 .add_system_set(SystemSet::on_update(GameState::Game).with_system(game))
                 .add_system_set(
@@ -235,6 +244,7 @@ mod game {
 }
 
 mod menu {
+    use async_trait::async_trait;
     use bevy::{app::AppExit, prelude::*};
 
     use super::{despawn_screen, DisplayQuality, GameState, Volume, TEXT_COLOR};
@@ -245,8 +255,9 @@ mod menu {
     // - two settings screen with a setting that can be set and a back button
     pub struct MenuPlugin;
 
+    #[async_trait]
     impl Plugin for MenuPlugin {
-        fn build(&self, app: &mut App) {
+        async fn build(&self, app: &mut App) {
             app
                 // At start, the menu is not enabled. This will be changed in `menu_setup` when
                 // entering the `GameState::Menu` state.
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
index 3f09f5c4c7ab9..81e7fffc0b02c 100644
--- a/examples/hello_world.rs
+++ b/examples/hello_world.rs
@@ -1,6 +1,7 @@
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new().add_system(hello_world_system).run();
 }
 
diff --git a/examples/input/char_input_events.rs b/examples/input/char_input_events.rs
index 1fbb7af53b7d4..8be50a258f382 100644
--- a/examples/input/char_input_events.rs
+++ b/examples/input/char_input_events.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, window::ReceivedCharacter};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(print_char_event_system)
         .run();
 }
diff --git a/examples/input/gamepad_input.rs b/examples/input/gamepad_input.rs
index 9ad04ff2c8101..d4f02f9a75a98 100644
--- a/examples/input/gamepad_input.rs
+++ b/examples/input/gamepad_input.rs
@@ -2,9 +2,11 @@
 
 use bevy::{input::gamepad::GamepadButton, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(gamepad_system)
         .run();
 }
diff --git a/examples/input/gamepad_input_events.rs b/examples/input/gamepad_input_events.rs
index 9bc020a22cde1..c23ba20d8b362 100644
--- a/examples/input/gamepad_input_events.rs
+++ b/examples/input/gamepad_input_events.rs
@@ -5,9 +5,11 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(gamepad_events)
         .run();
 }
diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs
index b235ae0c01136..6908b03a04cfd 100644
--- a/examples/input/keyboard_input.rs
+++ b/examples/input/keyboard_input.rs
@@ -5,9 +5,11 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(keyboard_input_system)
         .run();
 }
diff --git a/examples/input/keyboard_input_events.rs b/examples/input/keyboard_input_events.rs
index 1353ed35878b5..0064d399500a1 100644
--- a/examples/input/keyboard_input_events.rs
+++ b/examples/input/keyboard_input_events.rs
@@ -2,9 +2,11 @@
 
 use bevy::{input::keyboard::KeyboardInput, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(print_keyboard_event_system)
         .run();
 }
diff --git a/examples/input/keyboard_modifiers.rs b/examples/input/keyboard_modifiers.rs
index 0acb5672c4557..48d0a45d393db 100644
--- a/examples/input/keyboard_modifiers.rs
+++ b/examples/input/keyboard_modifiers.rs
@@ -5,9 +5,11 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(keyboard_input_system)
         .run();
 }
diff --git a/examples/input/mouse_grab.rs b/examples/input/mouse_grab.rs
index 7662814e27579..110218b474968 100644
--- a/examples/input/mouse_grab.rs
+++ b/examples/input/mouse_grab.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(grab_mouse)
         .run();
 }
diff --git a/examples/input/mouse_input.rs b/examples/input/mouse_input.rs
index 918a6713c2a75..ed0f014df20bf 100644
--- a/examples/input/mouse_input.rs
+++ b/examples/input/mouse_input.rs
@@ -2,9 +2,11 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(mouse_click_system)
         .run();
 }
diff --git a/examples/input/mouse_input_events.rs b/examples/input/mouse_input_events.rs
index 547038f40cb32..2f81bcb9692ab 100644
--- a/examples/input/mouse_input_events.rs
+++ b/examples/input/mouse_input_events.rs
@@ -6,9 +6,11 @@ use bevy::{
     window::CursorMoved,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(print_mouse_events_system)
         .run();
 }
diff --git a/examples/input/touch_input.rs b/examples/input/touch_input.rs
index b2427aebc4442..fc2bfcdf75f31 100644
--- a/examples/input/touch_input.rs
+++ b/examples/input/touch_input.rs
@@ -2,9 +2,11 @@
 
 use bevy::{input::touch::*, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(touch_system)
         .run();
 }
diff --git a/examples/input/touch_input_events.rs b/examples/input/touch_input_events.rs
index 665abd271e027..bf972cf8450f2 100644
--- a/examples/input/touch_input_events.rs
+++ b/examples/input/touch_input_events.rs
@@ -2,9 +2,11 @@
 
 use bevy::{input::touch::*, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(touch_event_system)
         .run();
 }
diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml
index 0e77864a9b737..c093d9e66ffb1 100644
--- a/examples/ios/Cargo.toml
+++ b/examples/ios/Cargo.toml
@@ -18,3 +18,4 @@ bevy = { path = "../../", features = [
   "vorbis",
   "filesystem_watcher"
 ], default-features = false}
+futures-lite = "1.12"
diff --git a/examples/ios/src/lib.rs b/examples/ios/src/lib.rs
index 220f2c3fd0866..cf5f915c88fef 100644
--- a/examples/ios/src/lib.rs
+++ b/examples/ios/src/lib.rs
@@ -1,8 +1,10 @@
+#![allow(dead_code)]
+
 use bevy::{input::touch::TouchPhase, prelude::*, window::WindowMode};
 
 // the `bevy_main` proc_macro generates the required ios boilerplate
 #[bevy_main]
-fn main() {
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             resizable: false,
@@ -10,6 +12,7 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup_scene)
         .add_startup_system(setup_music)
         .add_system(touch_camera)
diff --git a/examples/reflection/generic_reflection.rs b/examples/reflection/generic_reflection.rs
index 072bed411611a..a5fe7c4866e65 100644
--- a/examples/reflection/generic_reflection.rs
+++ b/examples/reflection/generic_reflection.rs
@@ -3,9 +3,11 @@
 use bevy::{prelude::*, reflect::TypeRegistry};
 use std::any::TypeId;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // You must manually register each instance of a generic type
         .register_type::<MyType<u32>>()
         .add_startup_system(setup)
diff --git a/examples/reflection/reflection.rs b/examples/reflection/reflection.rs
index 8197299cb1732..38b63f5a1e7a2 100644
--- a/examples/reflection/reflection.rs
+++ b/examples/reflection/reflection.rs
@@ -13,9 +13,11 @@ use bevy::{
 };
 use serde::de::DeserializeSeed;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .register_type::<Foo>()
         .register_type::<Bar>()
         .add_startup_system(setup)
diff --git a/examples/reflection/reflection_types.rs b/examples/reflection/reflection_types.rs
index d6e7227699eae..4ab4e691bf8f6 100644
--- a/examples/reflection/reflection_types.rs
+++ b/examples/reflection/reflection_types.rs
@@ -9,9 +9,11 @@ use bevy::{
 };
 use serde::{Deserialize, Serialize};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/reflection/trait_reflection.rs b/examples/reflection/trait_reflection.rs
index 0c4c4eaf4004c..7ebb698344af0 100644
--- a/examples/reflection/trait_reflection.rs
+++ b/examples/reflection/trait_reflection.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, reflect::TypeRegistry};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .register_type::<MyType>()
         .run();
diff --git a/examples/scene/scene.rs b/examples/scene/scene.rs
index c6886e2244327..ca7fece342dd6 100644
--- a/examples/scene/scene.rs
+++ b/examples/scene/scene.rs
@@ -2,9 +2,11 @@
 
 use bevy::{prelude::*, reflect::TypeRegistry, utils::Duration};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .register_type::<ComponentA>()
         .register_type::<ComponentB>()
         .add_startup_system(save_scene_system.exclusive_system())
diff --git a/examples/shader/animate_shader.rs b/examples/shader/animate_shader.rs
index 048657c3ca9cb..650610ef2300b 100644
--- a/examples/shader/animate_shader.rs
+++ b/examples/shader/animate_shader.rs
@@ -2,6 +2,7 @@
 //!
 //! This example uses a specialized pipeline.
 
+use async_trait::async_trait;
 use bevy::{
     core_pipeline::core_3d::Transparent3d,
     ecs::system::{lifetimeless::SRes, SystemParamItem},
@@ -24,10 +25,13 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(CustomMaterialPlugin)
+        .await
         .add_startup_system(setup)
         .run();
 }
@@ -55,8 +59,9 @@ struct CustomMaterial;
 
 pub struct CustomMaterialPlugin;
 
+#[async_trait]
 impl Plugin for CustomMaterialPlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let render_device = app.world.resource::<RenderDevice>();
         let buffer = render_device.create_buffer(&BufferDescriptor {
             label: Some("time uniform buffer"),
diff --git a/examples/shader/compute_shader_game_of_life.rs b/examples/shader/compute_shader_game_of_life.rs
index 450e6e80b2a4a..b875562ab2ce8 100644
--- a/examples/shader/compute_shader_game_of_life.rs
+++ b/examples/shader/compute_shader_game_of_life.rs
@@ -3,6 +3,7 @@
 //! Compute shaders use the GPU for computing arbitrary information, that may be independent of what
 //! is rendered to the screen.
 
+use async_trait::async_trait;
 use bevy::{
     prelude::*,
     render::{
@@ -20,7 +21,8 @@ use std::borrow::Cow;
 const SIZE: (u32, u32) = (1280, 720);
 const WORKGROUP_SIZE: u32 = 8;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(ClearColor(Color::BLACK))
         .insert_resource(WindowDescriptor {
@@ -29,7 +31,9 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(GameOfLifeComputePlugin)
+        .await
         .add_startup_system(setup)
         .run();
 }
@@ -64,11 +68,13 @@ fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>) {
 
 pub struct GameOfLifeComputePlugin;
 
+#[async_trait]
 impl Plugin for GameOfLifeComputePlugin {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         // Extract the game of life image resource from the main world into the render world
         // for operation on by the compute shader and display on the sprite.
-        app.add_plugin(ExtractResourcePlugin::<GameOfLifeImage>::default());
+        app.add_plugin(ExtractResourcePlugin::<GameOfLifeImage>::default())
+            .await;
         let render_app = app.sub_app_mut(RenderApp);
         render_app
             .init_resource::<GameOfLifePipeline>()
diff --git a/examples/shader/custom_vertex_attribute.rs b/examples/shader/custom_vertex_attribute.rs
index 8ed4a28947efa..22a42f7b72141 100644
--- a/examples/shader/custom_vertex_attribute.rs
+++ b/examples/shader/custom_vertex_attribute.rs
@@ -18,10 +18,13 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(MaterialPlugin::<CustomMaterial>::default())
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/shader/post_processing.rs b/examples/shader/post_processing.rs
index e0e8a1608c76e..20e62fd33004e 100644
--- a/examples/shader/post_processing.rs
+++ b/examples/shader/post_processing.rs
@@ -23,10 +23,13 @@ use bevy::{
     sprite::{Material2d, Material2dPipeline, Material2dPlugin, MaterialMesh2dBundle},
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins)
+        .await
         .add_plugin(Material2dPlugin::<PostProcessingMaterial>::default())
+        .await
         .add_startup_system(setup)
         .add_system(main_camera_cube_rotator_system);
 
diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs
index 3164da5c0179b..c96bd9022223f 100644
--- a/examples/shader/shader_defs.rs
+++ b/examples/shader/shader_defs.rs
@@ -1,5 +1,6 @@
 //! A shader that uses "shaders defs" (a bevy tool to selectively toggle parts of a shader)
 
+use async_trait::async_trait;
 use bevy::{
     core_pipeline::core_3d::Transparent3d,
     pbr::{
@@ -23,9 +24,11 @@ use bevy::{
 
 pub struct IsRedPlugin;
 
+#[async_trait]
 impl Plugin for IsRedPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(ExtractComponentPlugin::<IsRed>::default());
+    async fn build(&self, app: &mut App) {
+        app.add_plugin(ExtractComponentPlugin::<IsRed>::default())
+            .await;
         app.sub_app_mut(RenderApp)
             .add_render_command::<Transparent3d, DrawIsRed>()
             .init_resource::<IsRedPipeline>()
@@ -34,10 +37,13 @@ impl Plugin for IsRedPlugin {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(IsRedPlugin)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs
index 4d45397a72653..4f6cd9cc367d9 100644
--- a/examples/shader/shader_instancing.rs
+++ b/examples/shader/shader_instancing.rs
@@ -1,5 +1,6 @@
 //! A shader that renders a mesh multiple times in one draw call.
 
+use async_trait::async_trait;
 use bevy::{
     core_pipeline::core_3d::Transparent3d,
     ecs::system::{lifetimeless::*, SystemParamItem},
@@ -22,10 +23,13 @@ use bevy::{
 };
 use bytemuck::{Pod, Zeroable};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(CustomMaterialPlugin)
+        .await
         .add_startup_system(setup)
         .run();
 }
@@ -78,9 +82,11 @@ impl ExtractComponent for InstanceMaterialData {
 
 pub struct CustomMaterialPlugin;
 
+#[async_trait]
 impl Plugin for CustomMaterialPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(ExtractComponentPlugin::<InstanceMaterialData>::default());
+    async fn build(&self, app: &mut App) {
+        app.add_plugin(ExtractComponentPlugin::<InstanceMaterialData>::default())
+            .await;
         app.sub_app_mut(RenderApp)
             .add_render_command::<Transparent3d, DrawCustom>()
             .init_resource::<CustomPipeline>()
diff --git a/examples/shader/shader_material.rs b/examples/shader/shader_material.rs
index bb9d571c56caa..6b481d853a109 100644
--- a/examples/shader/shader_material.rs
+++ b/examples/shader/shader_material.rs
@@ -17,10 +17,13 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(MaterialPlugin::<CustomMaterial>::default())
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/shader/shader_material_glsl.rs b/examples/shader/shader_material_glsl.rs
index 181661b80439b..1a47111b09ed0 100644
--- a/examples/shader/shader_material_glsl.rs
+++ b/examples/shader/shader_material_glsl.rs
@@ -13,10 +13,13 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(MaterialPlugin::<CustomMaterial>::default())
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/shader/shader_material_screenspace_texture.rs b/examples/shader/shader_material_screenspace_texture.rs
index a196700328aa2..3e3738e7d3e2c 100644
--- a/examples/shader/shader_material_screenspace_texture.rs
+++ b/examples/shader/shader_material_screenspace_texture.rs
@@ -16,10 +16,13 @@ use bevy::{
     },
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(MaterialPlugin::<CustomMaterial>::default())
+        .await
         .add_startup_system(setup)
         .add_system(rotate_camera)
         .run();
diff --git a/examples/stress_tests/bevymark.rs b/examples/stress_tests/bevymark.rs
index 92ead3b8736a9..70d5536563419 100644
--- a/examples/stress_tests/bevymark.rs
+++ b/examples/stress_tests/bevymark.rs
@@ -26,7 +26,8 @@ struct Bird {
     velocity: Vec3,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             title: "BevyMark".to_string(),
@@ -37,8 +38,11 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .insert_resource(BevyCounter {
             count: 0,
             color: Color::WHITE,
diff --git a/examples/stress_tests/many_cubes.rs b/examples/stress_tests/many_cubes.rs
index 6ced37ee137b8..ec293b278abce 100644
--- a/examples/stress_tests/many_cubes.rs
+++ b/examples/stress_tests/many_cubes.rs
@@ -16,11 +16,15 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .add_startup_system(setup)
         .add_system(move_camera)
         .add_system(print_mesh_count)
diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs
index 838912a5ddb2f..3e8edeefd5036 100644
--- a/examples/stress_tests/many_foxes.rs
+++ b/examples/stress_tests/many_foxes.rs
@@ -12,15 +12,19 @@ struct Foxes {
     moving: bool,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             title: "🦊🦊🦊 Many Foxes! 🦊🦊🦊".to_string(),
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin)
+        .await
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .insert_resource(Foxes {
             count: std::env::args()
                 .nth(1)
diff --git a/examples/stress_tests/many_lights.rs b/examples/stress_tests/many_lights.rs
index 2d8ee93f70c03..27c41e19599e1 100644
--- a/examples/stress_tests/many_lights.rs
+++ b/examples/stress_tests/many_lights.rs
@@ -1,6 +1,7 @@
 //! Simple benchmark to test rendering many point lights.
 //! Run with `WGPU_SETTINGS_PRIO=webgl2` to restrict to uniform buffers and max 256 lights.
 
+use async_trait::async_trait;
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     math::{DVec2, DVec3},
@@ -10,7 +11,8 @@ use bevy::{
 };
 use rand::{thread_rng, Rng};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             width: 1024.0,
@@ -20,12 +22,16 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .add_startup_system(setup)
         .add_system(move_camera)
         .add_system(print_light_count)
         .add_plugin(LogVisibleLights)
+        .await
         .run();
 }
 
@@ -139,8 +145,9 @@ fn print_light_count(time: Res<Time>, mut timer: Local<PrintingTimer>, lights: Q
 
 struct LogVisibleLights;
 
+#[async_trait]
 impl Plugin for LogVisibleLights {
-    fn build(&self, app: &mut App) {
+    async fn build(&self, app: &mut App) {
         let render_app = match app.get_sub_app_mut(RenderApp) {
             Ok(render_app) => render_app,
             Err(_) => return,
diff --git a/examples/stress_tests/many_sprites.rs b/examples/stress_tests/many_sprites.rs
index 7c5112958e659..229075faf8637 100644
--- a/examples/stress_tests/many_sprites.rs
+++ b/examples/stress_tests/many_sprites.rs
@@ -15,12 +15,16 @@ use rand::Rng;
 
 const CAMERA_SPEED: f32 = 1000.0;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // Since this is also used as a benchmark, we want it to display performance data.
         .add_plugin(LogDiagnosticsPlugin::default())
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(print_sprite_count)
         .add_system(move_camera.after(print_sprite_count))
diff --git a/examples/stress_tests/transform_hierarchy.rs b/examples/stress_tests/transform_hierarchy.rs
index c8561727c8118..a1b7862d05b95 100644
--- a/examples/stress_tests/transform_hierarchy.rs
+++ b/examples/stress_tests/transform_hierarchy.rs
@@ -158,7 +158,8 @@ fn print_available_configs() {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     // parse cli argument and find the selected test configuration
     let cfg: Cfg = match std::env::args().nth(1) {
         Some(arg) => match CONFIGS.iter().find(|(name, _)| *name == arg) {
@@ -184,7 +185,9 @@ fn main() {
     App::new()
         .insert_resource(cfg)
         .add_plugins(MinimalPlugins)
+        .await
         .add_plugin(TransformPlugin::default())
+        .await
         .add_startup_system(setup)
         .add_system(update)
         .run();
diff --git a/examples/tools/scene_viewer.rs b/examples/tools/scene_viewer.rs
index 5d4fbce90a4b7..3ae42949565a1 100644
--- a/examples/tools/scene_viewer.rs
+++ b/examples/tools/scene_viewer.rs
@@ -17,7 +17,8 @@ use bevy::{
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]
 struct CameraControllerCheckSystem;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     println!(
         "
 Controls:
@@ -53,6 +54,7 @@ Controls:
     })
     .init_resource::<CameraTracker>()
     .add_plugins(DefaultPlugins)
+    .await
     .add_startup_system(setup)
     .add_system_to_stage(CoreStage::PreUpdate, scene_load_check)
     .add_system_to_stage(CoreStage::PreUpdate, setup_scene_after_load)
diff --git a/examples/transforms/3d_rotation.rs b/examples/transforms/3d_rotation.rs
index 35d51dbb28424..a5aac06f4000d 100644
--- a/examples/transforms/3d_rotation.rs
+++ b/examples/transforms/3d_rotation.rs
@@ -12,9 +12,11 @@ struct Rotatable {
     speed: f32,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(rotate_cube)
         .run();
diff --git a/examples/transforms/global_vs_local_translation.rs b/examples/transforms/global_vs_local_translation.rs
index 1ca662c679f04..3d41b628279bd 100644
--- a/examples/transforms/global_vs_local_translation.rs
+++ b/examples/transforms/global_vs_local_translation.rs
@@ -23,9 +23,11 @@ struct Direction(Vec3);
 #[derive(Component)]
 struct ToggledBy(KeyCode);
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .init_resource::<Direction>()
         .add_system(move_cubes_according_to_global_transform)
diff --git a/examples/transforms/scale.rs b/examples/transforms/scale.rs
index 4542920ca7a99..043619a9792e7 100644
--- a/examples/transforms/scale.rs
+++ b/examples/transforms/scale.rs
@@ -25,9 +25,11 @@ impl Scaling {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(change_scale_direction)
         .add_system(scale_cube)
diff --git a/examples/transforms/transform.rs b/examples/transforms/transform.rs
index 4caac6a49d007..3049d50a8330d 100644
--- a/examples/transforms/transform.rs
+++ b/examples/transforms/transform.rs
@@ -21,9 +21,11 @@ struct Center {
     scale_factor: f32,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(move_cube)
         .add_system(rotate_cube)
diff --git a/examples/transforms/translation.rs b/examples/transforms/translation.rs
index 52005ad73e044..4905860c9d40c 100644
--- a/examples/transforms/translation.rs
+++ b/examples/transforms/translation.rs
@@ -22,9 +22,11 @@ impl Movable {
     }
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(move_cube)
         .run();
diff --git a/examples/ui/button.rs b/examples/ui/button.rs
index 456ed9f1b400f..b6db2872b0e08 100644
--- a/examples/ui/button.rs
+++ b/examples/ui/button.rs
@@ -3,9 +3,11 @@
 
 use bevy::{prelude::*, winit::WinitSettings};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // Only run the app when there is user input. This will significantly reduce CPU/GPU use.
         .insert_resource(WinitSettings::desktop_app())
         .add_startup_system(setup)
diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs
index 27f04ccd067df..cd8e0e5decfbc 100644
--- a/examples/ui/font_atlas_debug.rs
+++ b/examples/ui/font_atlas_debug.rs
@@ -3,11 +3,13 @@
 
 use bevy::{prelude::*, text::FontAtlasSet};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .init_resource::<State>()
         .insert_resource(ClearColor(Color::BLACK))
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(text_update_system)
         .add_system(atlas_render_system)
diff --git a/examples/ui/text.rs b/examples/ui/text.rs
index 8e2c7fc71879c..286479e8c1a60 100644
--- a/examples/ui/text.rs
+++ b/examples/ui/text.rs
@@ -8,10 +8,13 @@ use bevy::{
     prelude::*,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
+        .await
         .add_startup_system(setup)
         .add_system(text_update_system)
         .add_system(text_color_system)
diff --git a/examples/ui/text_debug.rs b/examples/ui/text_debug.rs
index 0f68b47076d8c..281b7ce7b174a 100644
--- a/examples/ui/text_debug.rs
+++ b/examples/ui/text_debug.rs
@@ -6,14 +6,17 @@ use bevy::{
     window::PresentMode,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             present_mode: PresentMode::Immediate,
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_plugin(FrameTimeDiagnosticsPlugin)
+        .await
         .add_startup_system(infotext_system)
         .add_system(change_text_system)
         .run();
diff --git a/examples/ui/transparency_ui.rs b/examples/ui/transparency_ui.rs
index db96a110fe0f9..73efb4b7090c4 100644
--- a/examples/ui/transparency_ui.rs
+++ b/examples/ui/transparency_ui.rs
@@ -3,10 +3,12 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(ClearColor(Color::BLACK))
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .run();
 }
diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs
index 5746b9e7306dc..de3ef65b45f0e 100644
--- a/examples/ui/ui.rs
+++ b/examples/ui/ui.rs
@@ -6,9 +6,11 @@ use bevy::{
     winit::WinitSettings,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         // Only run the app when there is user input. This will significantly reduce CPU/GPU use.
         .insert_resource(WinitSettings::desktop_app())
         .add_startup_system(setup)
diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs
index 25ffc6c0db78a..0d98261365714 100644
--- a/examples/window/clear_color.rs
+++ b/examples/window/clear_color.rs
@@ -4,10 +4,12 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.5, 0.5, 0.9)))
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(change_clear_color)
         .run();
diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs
index 0baf8a7ca8441..c1affffc74b29 100644
--- a/examples/window/low_power.rs
+++ b/examples/window/low_power.rs
@@ -11,7 +11,8 @@ use bevy::{
     winit::WinitSettings,
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // Continuous rendering for games - bevy's default.
         .insert_resource(WinitSettings::game())
@@ -32,6 +33,7 @@ fn main() {
         })
         .insert_resource(ExampleMode::Game)
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(test_setup::setup)
         .add_system(test_setup::cycle_modes)
         .add_system(test_setup::rotate_cube)
diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs
index 7d9e4a643de69..4e8380f968ab5 100644
--- a/examples/window/multiple_windows.rs
+++ b/examples/window/multiple_windows.rs
@@ -6,9 +6,11 @@ use bevy::{
     window::{CreateWindow, PresentMode, WindowId},
 };
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(bevy::window::close_on_esc)
         .run();
diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
index f4f179697f76c..8141e3963e6d5 100644
--- a/examples/window/scale_factor_override.rs
+++ b/examples/window/scale_factor_override.rs
@@ -3,7 +3,8 @@
 
 use bevy::prelude::*;
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             width: 500.,
@@ -11,6 +12,7 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_startup_system(setup)
         .add_system(toggle_override)
         .add_system(change_scale_factor)
diff --git a/examples/window/transparent_window.rs b/examples/window/transparent_window.rs
index c1f37ff4e072e..910bb547b62bd 100644
--- a/examples/window/transparent_window.rs
+++ b/examples/window/transparent_window.rs
@@ -6,7 +6,8 @@
 
 use bevy::{prelude::*, window::WindowDescriptor};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         // ClearColor must have 0 alpha, otherwise some color will bleed through
         .insert_resource(ClearColor(Color::NONE))
@@ -19,6 +20,7 @@ fn main() {
         })
         .add_startup_system(setup)
         .add_plugins(DefaultPlugins)
+        .await
         .run();
 }
 
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index ef11098faa904..56a88b3bcf9d6 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -3,7 +3,8 @@
 
 use bevy::{prelude::*, window::PresentMode};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             title: "I am a window!".to_string(),
@@ -13,6 +14,7 @@ fn main() {
             ..default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(change_title)
         .add_system(toggle_cursor)
         .add_system(cycle_cursor_icon)
diff --git a/tests/window/minimising.rs b/tests/window/minimising.rs
index 4814bb863fecd..78f24150feb4d 100644
--- a/tests/window/minimising.rs
+++ b/tests/window/minimising.rs
@@ -2,7 +2,8 @@
 //! This is run in CI to ensure that this doesn't regress again.
 use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*};
 
-fn main() {
+#[bevy_main]
+async fn main() {
     // TODO: Combine this with `resizing` once multiple_windows is simpler than
     // it is currently.
     App::new()
@@ -11,6 +12,7 @@ fn main() {
             ..Default::default()
         })
         .add_plugins(DefaultPlugins)
+        .await
         .add_system(minimise_automatically)
         .add_startup_system(setup_3d)
         .add_startup_system(setup_2d)
diff --git a/tests/window/resizing.rs b/tests/window/resizing.rs
index 4389a75219944..412ac0a6c94fa 100644
--- a/tests/window/resizing.rs
+++ b/tests/window/resizing.rs
@@ -16,7 +16,8 @@ struct Dimensions {
     height: u16,
 }
 
-fn main() {
+#[bevy_main]
+async fn main() {
     App::new()
         .insert_resource(WindowDescriptor {
             width: MAX_WIDTH.try_into().unwrap(),
@@ -30,6 +31,7 @@ fn main() {
             height: MAX_HEIGHT,
         })
         .add_plugins(DefaultPlugins)
+        .await
         .insert_resource(Phase::ContractingY)
         .add_system(change_window_size)
         .add_system(sync_dimensions)
diff --git a/tools/build-wasm-example/src/main.rs b/tools/build-wasm-example/src/main.rs
index a86e7c8872c48..b29d8eecdf096 100644
--- a/tools/build-wasm-example/src/main.rs
+++ b/tools/build-wasm-example/src/main.rs
@@ -13,6 +13,10 @@ struct Args {
     /// Run tests
     test: bool,
 
+    #[clap(long, value_parser)]
+    /// Build for webgpu
+    webgpu: bool,
+
     #[clap(short, long, value_parser)]
     /// Run on the given browsers. By default, chromium, firefox, webkit
     browsers: Vec<String>,
@@ -24,27 +28,42 @@ struct Args {
 
 fn main() {
     let cli = Args::parse();
-    eprintln!("{:?}", cli);
 
     assert!(!cli.examples.is_empty(), "must have at least one example");
 
-    let mut bevy_ci_testing = vec![];
+    let mut features = vec![];
     if let Some(frames) = cli.frames {
         let mut file = File::create("ci_testing_config.ron").unwrap();
         file.write_fmt(format_args!("(exit_after: Some({}))", frames))
             .unwrap();
-        bevy_ci_testing = vec!["--features", "bevy_ci_testing"];
+        features.push("bevy_ci_testing");
+    }
+
+    if cli.webgpu {
+        features.push("webgpu");
+        println!("/!\\ /!\\ /!\\ /!\\ /!\\");
+        println!("You enabled the webgpu feature.");
+        println!("For it to work, you need to manually edit the root Cargo.toml to remove the webgl feature.");
+        println!("/!\\ /!\\ /!\\ /!\\ /!\\");
     }
 
     for example in cli.examples {
         let sh = Shell::new().unwrap();
-        let bevy_ci_testing = bevy_ci_testing.clone();
-        cmd!(
+        // let features = features.clone();
+        let features_string = features.join(",");
+        let features = if !features.is_empty() {
+            vec!["--features", &features_string]
+        } else {
+            vec![]
+        };
+        let mut cmd = cmd!(
             sh,
-            "cargo build {bevy_ci_testing...} --release --target wasm32-unknown-unknown --example {example}"
-        )
-        .run()
-        .expect("Error building example");
+            "cargo build {features...} --release --target wasm32-unknown-unknown --example {example}"
+        );
+        if cli.webgpu {
+            cmd = cmd.env("RUSTFLAGS", "--cfg=web_sys_unstable_apis");
+        }
+        cmd.run().expect("Error building example");
         cmd!(
             sh,
             "wasm-bindgen --out-dir examples/wasm/target --out-name wasm_example --target web target/wasm32-unknown-unknown/release/examples/{example}.wasm"