diff --git a/Cargo.lock b/Cargo.lock
index dbb41f1..318641b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -826,6 +826,19 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61baa1bdc1f4a7ac2c18217570a7cc04e1cd54d38456e91782f0371c79afe0a8"
 
+[[package]]
+name = "bevy_rapier2d"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17d82b9cbb851249a8859647ae3a2c5d17664df1da27ccd43fddd1faa66b58a6"
+dependencies = [
+ "bevy",
+ "bitflags 2.6.0",
+ "log",
+ "nalgebra",
+ "rapier2d 0.21.0",
+]
+
 [[package]]
 name = "bevy_reflect"
 version = "0.14.2"
@@ -2548,6 +2561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
 dependencies = [
  "approx",
+ "glam",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -3061,6 +3075,30 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "parry2d"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8aa1c304489b71ab35ad4080c5a333a5fc24b2a5f244f197dedb93276c9a05"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "bitflags 2.6.0",
+ "downcast-rs",
+ "either",
+ "log",
+ "nalgebra",
+ "num-derive",
+ "num-traits",
+ "ordered-float",
+ "rustc-hash 2.0.0",
+ "simba",
+ "slab",
+ "smallvec",
+ "spade",
+ "thiserror",
+]
+
 [[package]]
 name = "parry2d"
 version = "0.17.1"
@@ -3261,6 +3299,29 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
+[[package]]
+name = "rapier2d"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9a115cec2cd9533e376e23c87a7869508691a7b38ab078cc8a8e1cd24d9d1b"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "bit-vec 0.6.3",
+ "bitflags 2.6.0",
+ "crossbeam",
+ "downcast-rs",
+ "log",
+ "nalgebra",
+ "num-derive",
+ "num-traits",
+ "ordered-float",
+ "parry2d 0.16.1",
+ "rustc-hash 2.0.0",
+ "simba",
+ "thiserror",
+]
+
 [[package]]
 name = "rapier2d"
 version = "0.22.0"
@@ -3278,7 +3339,7 @@ dependencies = [
  "num-derive",
  "num-traits",
  "ordered-float",
- "parry2d",
+ "parry2d 0.17.1",
  "rustc-hash 2.0.0",
  "simba",
  "thiserror",
@@ -3538,7 +3599,8 @@ dependencies = [
  "bevy",
  "bevy_ecs_ldtk",
  "bevy_ecs_tilemap",
- "rapier2d",
+ "bevy_rapier2d",
+ "rapier2d 0.22.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 68e3a47..c2f9751 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,3 +8,4 @@ bevy = "0.14.2"
 bevy_ecs_tilemap = "0.14"
 bevy_ecs_ldtk = "0.10"
 rapier2d = "0.22.0"
+bevy_rapier2d = "0.27.0"
diff --git a/assets/Characters/dog/.DS_Store b/assets/Characters/dog/.DS_Store
new file mode 100644
index 0000000..65ea0a8
Binary files /dev/null and b/assets/Characters/dog/.DS_Store differ
diff --git a/assets/Characters/dog/Sprites/.DS_Store b/assets/Characters/dog/Sprites/.DS_Store
new file mode 100644
index 0000000..e432192
Binary files /dev/null and b/assets/Characters/dog/Sprites/.DS_Store differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet1.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet1.png
new file mode 100644
index 0000000..0722ad4
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet1.png differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet2.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet2.png
new file mode 100644
index 0000000..b0271dc
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet2.png differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet3.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet3.png
new file mode 100644
index 0000000..d4803d5
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet3.png differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet4.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet4.png
new file mode 100644
index 0000000..f2eba34
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet4.png differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet5.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet5.png
new file mode 100644
index 0000000..cf1e735
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet5.png differ
diff --git a/assets/Characters/dog/Sprites/Dog-idle/dog-idlet6.png b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet6.png
new file mode 100644
index 0000000..efd3ffc
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog-idle/dog-idlet6.png differ
diff --git a/assets/Characters/dog/Sprites/Dog/dog1.png b/assets/Characters/dog/Sprites/Dog/dog1.png
new file mode 100644
index 0000000..e69a46f
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog/dog1.png differ
diff --git a/assets/Characters/dog/Sprites/Dog/dog2.png b/assets/Characters/dog/Sprites/Dog/dog2.png
new file mode 100644
index 0000000..9f13d3c
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog/dog2.png differ
diff --git a/assets/Characters/dog/Sprites/Dog/dog3.png b/assets/Characters/dog/Sprites/Dog/dog3.png
new file mode 100644
index 0000000..3b7013c
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog/dog3.png differ
diff --git a/assets/Characters/dog/Sprites/Dog/dog4.png b/assets/Characters/dog/Sprites/Dog/dog4.png
new file mode 100644
index 0000000..dd40516
Binary files /dev/null and b/assets/Characters/dog/Sprites/Dog/dog4.png differ
diff --git a/assets/Characters/dog/Spritesheets/dog-idle.png b/assets/Characters/dog/Spritesheets/dog-idle.png
new file mode 100644
index 0000000..b1beabb
Binary files /dev/null and b/assets/Characters/dog/Spritesheets/dog-idle.png differ
diff --git a/assets/Characters/dog/Spritesheets/dog.png b/assets/Characters/dog/Spritesheets/dog.png
new file mode 100644
index 0000000..02d445a
Binary files /dev/null and b/assets/Characters/dog/Spritesheets/dog.png differ
diff --git a/assets/Characters/dog/dog.ase b/assets/Characters/dog/dog.ase
new file mode 100644
index 0000000..94427c3
Binary files /dev/null and b/assets/Characters/dog/dog.ase differ
diff --git a/assets/miguel/Miguel-Idle.png b/assets/Characters/miguel/Miguel-Idle.png
similarity index 100%
rename from assets/miguel/Miguel-Idle.png
rename to assets/Characters/miguel/Miguel-Idle.png
diff --git a/assets/miguel/Miguel-Walk.png b/assets/Characters/miguel/Miguel-Walk.png
similarity index 100%
rename from assets/miguel/Miguel-Walk.png
rename to assets/Characters/miguel/Miguel-Walk.png
diff --git a/assets/environment/Forest/.DS_Store b/assets/environment/Forest/.DS_Store
new file mode 100644
index 0000000..d8910b0
Binary files /dev/null and b/assets/environment/Forest/.DS_Store differ
diff --git a/assets/environment/Forest/Background Layers/.DS_Store b/assets/environment/Forest/Background Layers/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/assets/environment/Forest/Background Layers/.DS_Store differ
diff --git a/assets/environment/Forest/Background Layers/background.png b/assets/environment/Forest/Background Layers/background.png
new file mode 100644
index 0000000..c897f67
Binary files /dev/null and b/assets/environment/Forest/Background Layers/background.png differ
diff --git a/assets/environment/Forest/Background Layers/middleground.png b/assets/environment/Forest/Background Layers/middleground.png
new file mode 100644
index 0000000..72949f3
Binary files /dev/null and b/assets/environment/Forest/Background Layers/middleground.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-1.png b/assets/environment/Forest/sprites/enemies/bee/bee-1.png
new file mode 100644
index 0000000..12dd06e
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-1.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-2.png b/assets/environment/Forest/sprites/enemies/bee/bee-2.png
new file mode 100644
index 0000000..dda741d
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-2.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-3.png b/assets/environment/Forest/sprites/enemies/bee/bee-3.png
new file mode 100644
index 0000000..f19ca76
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-3.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-4.png b/assets/environment/Forest/sprites/enemies/bee/bee-4.png
new file mode 100644
index 0000000..6fcd29c
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-4.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-5.png b/assets/environment/Forest/sprites/enemies/bee/bee-5.png
new file mode 100644
index 0000000..27f8aaa
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-5.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-6.png b/assets/environment/Forest/sprites/enemies/bee/bee-6.png
new file mode 100644
index 0000000..0251f03
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-6.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-7.png b/assets/environment/Forest/sprites/enemies/bee/bee-7.png
new file mode 100644
index 0000000..7871322
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-7.png differ
diff --git a/assets/environment/Forest/sprites/enemies/bee/bee-8.png b/assets/environment/Forest/sprites/enemies/bee/bee-8.png
new file mode 100644
index 0000000..b26e725
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/bee/bee-8.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-1.png b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-1.png
new file mode 100644
index 0000000..57a2bf3
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-1.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-2.png b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-2.png
new file mode 100644
index 0000000..1aa9750
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-2.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-3.png b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-3.png
new file mode 100644
index 0000000..8dbd29e
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-3.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-4.png b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-4.png
new file mode 100644
index 0000000..851c0c6
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-4.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-1.png b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-1.png
new file mode 100644
index 0000000..57a2bf3
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-1.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-2.png b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-2.png
new file mode 100644
index 0000000..1aa9750
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-2.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-3.png b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-3.png
new file mode 100644
index 0000000..3437764
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-3.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-4.png b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-4.png
new file mode 100644
index 0000000..d66ab58
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-4.png differ
diff --git a/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-5.png b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-5.png
new file mode 100644
index 0000000..c2757de
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-5.png differ
diff --git a/assets/environment/Forest/sprites/enemies/slug/slug-1.png b/assets/environment/Forest/sprites/enemies/slug/slug-1.png
new file mode 100644
index 0000000..311fcb4
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/slug/slug-1.png differ
diff --git a/assets/environment/Forest/sprites/enemies/slug/slug-2.png b/assets/environment/Forest/sprites/enemies/slug/slug-2.png
new file mode 100644
index 0000000..5d4208a
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/slug/slug-2.png differ
diff --git a/assets/environment/Forest/sprites/enemies/slug/slug-3.png b/assets/environment/Forest/sprites/enemies/slug/slug-3.png
new file mode 100644
index 0000000..f21085f
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/slug/slug-3.png differ
diff --git a/assets/environment/Forest/sprites/enemies/slug/slug-4.png b/assets/environment/Forest/sprites/enemies/slug/slug-4.png
new file mode 100644
index 0000000..a205ce6
Binary files /dev/null and b/assets/environment/Forest/sprites/enemies/slug/slug-4.png differ
diff --git a/assets/environment/Forest/sprites/misc/carrot/carrot-1.png b/assets/environment/Forest/sprites/misc/carrot/carrot-1.png
new file mode 100644
index 0000000..8fa7b85
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/carrot/carrot-1.png differ
diff --git a/assets/environment/Forest/sprites/misc/carrot/carrot-2.png b/assets/environment/Forest/sprites/misc/carrot/carrot-2.png
new file mode 100644
index 0000000..9f72e4d
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/carrot/carrot-2.png differ
diff --git a/assets/environment/Forest/sprites/misc/carrot/carrot-3.png b/assets/environment/Forest/sprites/misc/carrot/carrot-3.png
new file mode 100644
index 0000000..7aec983
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/carrot/carrot-3.png differ
diff --git a/assets/environment/Forest/sprites/misc/carrot/carrot-4.png b/assets/environment/Forest/sprites/misc/carrot/carrot-4.png
new file mode 100644
index 0000000..539f636
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/carrot/carrot-4.png differ
diff --git a/assets/environment/Forest/sprites/misc/chest/chest-1.png b/assets/environment/Forest/sprites/misc/chest/chest-1.png
new file mode 100644
index 0000000..79e30f0
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/chest/chest-1.png differ
diff --git a/assets/environment/Forest/sprites/misc/chest/chest-2.png b/assets/environment/Forest/sprites/misc/chest/chest-2.png
new file mode 100644
index 0000000..8f64ee1
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/chest/chest-2.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-1.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-1.png
new file mode 100644
index 0000000..730013f
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-1.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-2.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-2.png
new file mode 100644
index 0000000..dc54251
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-2.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-3.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-3.png
new file mode 100644
index 0000000..c34f264
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-3.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-4.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-4.png
new file mode 100644
index 0000000..dd4711b
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-4.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-5.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-5.png
new file mode 100644
index 0000000..96c26b1
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-5.png differ
diff --git a/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-6.png b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-6.png
new file mode 100644
index 0000000..4f0308d
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/enemy-death/enemy-death-6.png differ
diff --git a/assets/environment/Forest/sprites/misc/hud/hud-1.png b/assets/environment/Forest/sprites/misc/hud/hud-1.png
new file mode 100644
index 0000000..9075ae3
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/hud/hud-1.png differ
diff --git a/assets/environment/Forest/sprites/misc/hud/hud-2.png b/assets/environment/Forest/sprites/misc/hud/hud-2.png
new file mode 100644
index 0000000..360ae91
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/hud/hud-2.png differ
diff --git a/assets/environment/Forest/sprites/misc/hud/hud-3.png b/assets/environment/Forest/sprites/misc/hud/hud-3.png
new file mode 100644
index 0000000..091149d
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/hud/hud-3.png differ
diff --git a/assets/environment/Forest/sprites/misc/hud/hud-4.png b/assets/environment/Forest/sprites/misc/hud/hud-4.png
new file mode 100644
index 0000000..b7445b2
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/hud/hud-4.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-1.png b/assets/environment/Forest/sprites/misc/star/star-1.png
new file mode 100644
index 0000000..cc85a3a
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-1.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-2.png b/assets/environment/Forest/sprites/misc/star/star-2.png
new file mode 100644
index 0000000..503a997
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-2.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-3.png b/assets/environment/Forest/sprites/misc/star/star-3.png
new file mode 100644
index 0000000..540efbc
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-3.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-4.png b/assets/environment/Forest/sprites/misc/star/star-4.png
new file mode 100644
index 0000000..2e57627
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-4.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-5.png b/assets/environment/Forest/sprites/misc/star/star-5.png
new file mode 100644
index 0000000..7b61a38
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-5.png differ
diff --git a/assets/environment/Forest/sprites/misc/star/star-6.png b/assets/environment/Forest/sprites/misc/star/star-6.png
new file mode 100644
index 0000000..c710cab
Binary files /dev/null and b/assets/environment/Forest/sprites/misc/star/star-6.png differ
diff --git a/assets/environment/Forest/sprites/player/player-climb/player-climb-1.png b/assets/environment/Forest/sprites/player/player-climb/player-climb-1.png
new file mode 100644
index 0000000..179b0bb
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-climb/player-climb-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-climb/player-climb-2.png b/assets/environment/Forest/sprites/player/player-climb/player-climb-2.png
new file mode 100644
index 0000000..11d2ff9
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-climb/player-climb-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-climb/player-climb-3.png b/assets/environment/Forest/sprites/player/player-climb/player-climb-3.png
new file mode 100644
index 0000000..743e5bb
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-climb/player-climb-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-climb/player-climb-4.png b/assets/environment/Forest/sprites/player/player-climb/player-climb-4.png
new file mode 100644
index 0000000..11d2ff9
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-climb/player-climb-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-duck/player-duck-1.png b/assets/environment/Forest/sprites/player/player-duck/player-duck-1.png
new file mode 100644
index 0000000..07f4813
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-duck/player-duck-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-duck/player-duck-2.png b/assets/environment/Forest/sprites/player/player-duck/player-duck-2.png
new file mode 100644
index 0000000..aa39712
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-duck/player-duck-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-duck/player-duck-3.png b/assets/environment/Forest/sprites/player/player-duck/player-duck-3.png
new file mode 100644
index 0000000..f5ac5b0
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-duck/player-duck-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-duck/player-duck-4.png b/assets/environment/Forest/sprites/player/player-duck/player-duck-4.png
new file mode 100644
index 0000000..3dbdcdf
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-duck/player-duck-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-fall/player-fall-1.png b/assets/environment/Forest/sprites/player/player-fall/player-fall-1.png
new file mode 100644
index 0000000..8db36ba
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-fall/player-fall-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-fall/player-fall-2.png b/assets/environment/Forest/sprites/player/player-fall/player-fall-2.png
new file mode 100644
index 0000000..e3f3aac
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-fall/player-fall-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-fall/player-fall-3.png b/assets/environment/Forest/sprites/player/player-fall/player-fall-3.png
new file mode 100644
index 0000000..ac94881
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-fall/player-fall-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-fall/player-fall-4.png b/assets/environment/Forest/sprites/player/player-fall/player-fall-4.png
new file mode 100644
index 0000000..ca0184e
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-fall/player-fall-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-hurt/player-hurt-1.png b/assets/environment/Forest/sprites/player/player-hurt/player-hurt-1.png
new file mode 100644
index 0000000..5d082db
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-hurt/player-hurt-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-hurt/player-hurt-2.png b/assets/environment/Forest/sprites/player/player-hurt/player-hurt-2.png
new file mode 100644
index 0000000..c6b4053
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-hurt/player-hurt-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-1.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-1.png
new file mode 100644
index 0000000..36e0081
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-2.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-2.png
new file mode 100644
index 0000000..59fbc56
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-3.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-3.png
new file mode 100644
index 0000000..f6e19db
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-4.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-4.png
new file mode 100644
index 0000000..8701dd2
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-5.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-5.png
new file mode 100644
index 0000000..afd98bc
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-5.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-6.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-6.png
new file mode 100644
index 0000000..beb897e
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-6.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-7.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-7.png
new file mode 100644
index 0000000..3801af6
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-7.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-8.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-8.png
new file mode 100644
index 0000000..8da35d0
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-8.png differ
diff --git a/assets/environment/Forest/sprites/player/player-idle/player-idle-9.png b/assets/environment/Forest/sprites/player/player-idle/player-idle-9.png
new file mode 100644
index 0000000..fc58268
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-idle/player-idle-9.png differ
diff --git a/assets/environment/Forest/sprites/player/player-jump/player-jump-1.png b/assets/environment/Forest/sprites/player/player-jump/player-jump-1.png
new file mode 100644
index 0000000..9e55924
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-jump/player-jump-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-jump/player-jump-2.png b/assets/environment/Forest/sprites/player/player-jump/player-jump-2.png
new file mode 100644
index 0000000..3313f49
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-jump/player-jump-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-jump/player-jump-3.png b/assets/environment/Forest/sprites/player/player-jump/player-jump-3.png
new file mode 100644
index 0000000..794b665
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-jump/player-jump-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-jump/player-jump-4.png b/assets/environment/Forest/sprites/player/player-jump/player-jump-4.png
new file mode 100644
index 0000000..4160695
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-jump/player-jump-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-1.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-1.png
new file mode 100644
index 0000000..8164c75
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-1.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-2.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-2.png
new file mode 100644
index 0000000..24916b5
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-2.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-3.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-3.png
new file mode 100644
index 0000000..96dcf99
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-3.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-4.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-4.png
new file mode 100644
index 0000000..73a9124
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-4.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-5.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-5.png
new file mode 100644
index 0000000..36f5276
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-5.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-6.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-6.png
new file mode 100644
index 0000000..c6c329f
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-6.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-7.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-7.png
new file mode 100644
index 0000000..3b7dfed
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-7.png differ
diff --git a/assets/environment/Forest/sprites/player/player-skip/player-skip-8.png b/assets/environment/Forest/sprites/player/player-skip/player-skip-8.png
new file mode 100644
index 0000000..b3d9832
Binary files /dev/null and b/assets/environment/Forest/sprites/player/player-skip/player-skip-8.png differ
diff --git a/assets/environment/Forest/spritesheets/.DS_Store b/assets/environment/Forest/spritesheets/.DS_Store
new file mode 100644
index 0000000..74a448a
Binary files /dev/null and b/assets/environment/Forest/spritesheets/.DS_Store differ
diff --git a/assets/environment/Forest/spritesheets/enemies/bee.png b/assets/environment/Forest/spritesheets/enemies/bee.png
new file mode 100644
index 0000000..2648a8c
Binary files /dev/null and b/assets/environment/Forest/spritesheets/enemies/bee.png differ
diff --git a/assets/environment/Forest/spritesheets/enemies/piranha-plant-attack.png b/assets/environment/Forest/spritesheets/enemies/piranha-plant-attack.png
new file mode 100644
index 0000000..dcc810f
Binary files /dev/null and b/assets/environment/Forest/spritesheets/enemies/piranha-plant-attack.png differ
diff --git a/assets/environment/Forest/spritesheets/enemies/piranha-plant.png b/assets/environment/Forest/spritesheets/enemies/piranha-plant.png
new file mode 100644
index 0000000..bcdc225
Binary files /dev/null and b/assets/environment/Forest/spritesheets/enemies/piranha-plant.png differ
diff --git a/assets/environment/Forest/spritesheets/enemies/slug.png b/assets/environment/Forest/spritesheets/enemies/slug.png
new file mode 100644
index 0000000..5612c7d
Binary files /dev/null and b/assets/environment/Forest/spritesheets/enemies/slug.png differ
diff --git a/assets/environment/Forest/spritesheets/misc/carrot.png b/assets/environment/Forest/spritesheets/misc/carrot.png
new file mode 100644
index 0000000..d1bb5a1
Binary files /dev/null and b/assets/environment/Forest/spritesheets/misc/carrot.png differ
diff --git a/assets/environment/Forest/spritesheets/misc/chest.png b/assets/environment/Forest/spritesheets/misc/chest.png
new file mode 100644
index 0000000..43704d4
Binary files /dev/null and b/assets/environment/Forest/spritesheets/misc/chest.png differ
diff --git a/assets/environment/Forest/spritesheets/misc/enemy-death.png b/assets/environment/Forest/spritesheets/misc/enemy-death.png
new file mode 100644
index 0000000..9dd2a34
Binary files /dev/null and b/assets/environment/Forest/spritesheets/misc/enemy-death.png differ
diff --git a/assets/environment/Forest/spritesheets/misc/hud.png b/assets/environment/Forest/spritesheets/misc/hud.png
new file mode 100644
index 0000000..5c41792
Binary files /dev/null and b/assets/environment/Forest/spritesheets/misc/hud.png differ
diff --git a/assets/environment/Forest/spritesheets/misc/star.png b/assets/environment/Forest/spritesheets/misc/star.png
new file mode 100644
index 0000000..d05f6ef
Binary files /dev/null and b/assets/environment/Forest/spritesheets/misc/star.png differ
diff --git a/assets/environment/Forest/spritesheets/player/climb.png b/assets/environment/Forest/spritesheets/player/climb.png
new file mode 100644
index 0000000..c5ccec0
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/climb.png differ
diff --git a/assets/environment/Forest/spritesheets/player/duck.png b/assets/environment/Forest/spritesheets/player/duck.png
new file mode 100644
index 0000000..dca5adb
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/duck.png differ
diff --git a/assets/environment/Forest/spritesheets/player/fall.png b/assets/environment/Forest/spritesheets/player/fall.png
new file mode 100644
index 0000000..f1ad58b
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/fall.png differ
diff --git a/assets/environment/Forest/spritesheets/player/hurt.png b/assets/environment/Forest/spritesheets/player/hurt.png
new file mode 100644
index 0000000..a6ff9b4
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/hurt.png differ
diff --git a/assets/environment/Forest/spritesheets/player/idle.png b/assets/environment/Forest/spritesheets/player/idle.png
new file mode 100644
index 0000000..2b972a7
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/idle.png differ
diff --git a/assets/environment/Forest/spritesheets/player/jump.png b/assets/environment/Forest/spritesheets/player/jump.png
new file mode 100644
index 0000000..4100161
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/jump.png differ
diff --git a/assets/environment/Forest/spritesheets/player/skip.png b/assets/environment/Forest/spritesheets/player/skip.png
new file mode 100644
index 0000000..a0115a6
Binary files /dev/null and b/assets/environment/Forest/spritesheets/player/skip.png differ
diff --git a/assets/environment/Forest/tileset.png b/assets/environment/Forest/tileset.png
new file mode 100644
index 0000000..4eff6dd
Binary files /dev/null and b/assets/environment/Forest/tileset.png differ
diff --git a/assets/shocked-miguel.ldtk b/assets/shocked-miguel.ldtk
index 13780d1..e27eaeb 100644
--- a/assets/shocked-miguel.ldtk
+++ b/assets/shocked-miguel.ldtk
@@ -11,7 +11,7 @@
 	"iid": "ee0ceef0-73f0-11ef-b8f3-3f3814adfda6",
 	"jsonVersion": "1.5.3",
 	"appBuildId": 473703,
-	"nextUid": 58,
+	"nextUid": 60,
 	"identifierStyle": "Capitalize",
 	"toc": [],
 	"worldLayout": "LinearHorizontal",
@@ -391,7 +391,7 @@
 		},
 		{
 			"__type": "IntGrid",
-			"identifier": "Walls",
+			"identifier": "Collisions",
 			"type": "IntGrid",
 			"uid": 4,
 			"doc": null,
@@ -760,7 +760,82 @@
 			"limitBehavior": "MoveLastOne",
 			"pivotX": 0.5,
 			"pivotY": 1,
-			"fieldDefs": []
+			"fieldDefs": [
+				{
+					"identifier": "animation_timer",
+					"doc": null,
+					"__type": "Float",
+					"uid": 58,
+					"type": "F_Float",
+					"isArray": false,
+					"canBeNull": false,
+					"arrayMinLength": null,
+					"arrayMaxLength": null,
+					"editorDisplayMode": "Hidden",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "StraightArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": { "id": "V_Float", "params": [0.3] },
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": true,
+					"allowOutOfLevelRef": true,
+					"allowedRefs": "OnlySame",
+					"allowedRefsEntityUid": null,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				},
+				{
+					"identifier": "animation_indices",
+					"doc": null,
+					"__type": "Array<Int>",
+					"uid": 59,
+					"type": "F_Int",
+					"isArray": true,
+					"canBeNull": false,
+					"arrayMinLength": 2,
+					"arrayMaxLength": 2,
+					"editorDisplayMode": "Hidden",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "StraightArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": { "id": "V_Int", "params": [0] },
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": true,
+					"allowOutOfLevelRef": true,
+					"allowedRefs": "OnlySame",
+					"allowedRefsEntityUid": null,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				}
+			]
 		},
 		{
 			"identifier": "Goal",
@@ -794,7 +869,7 @@
 			"limitScope": "PerLevel",
 			"limitBehavior": "MoveLastOne",
 			"pivotX": 0.5,
-			"pivotY": 0.5,
+			"pivotY": 1,
 			"fieldDefs": []
 		},
 		{
@@ -908,7 +983,7 @@
 			"__cHei": 2,
 			"identifier": "Miguel",
 			"uid": 27,
-			"relPath": "miguel/Miguel-Idle.png",
+			"relPath": "Characters/miguel/Miguel-Idle.png",
 			"embedAtlas": null,
 			"pxWid": 64,
 			"pxHei": 64,
@@ -927,7 +1002,7 @@
 			"__cHei": 12,
 			"identifier": "Forest",
 			"uid": 2,
-			"relPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Environments/Forest/Forest Pack/PNG/environment/tileset.png",
+			"relPath": "environment/Forest/tileset.png",
 			"embedAtlas": null,
 			"pxWid": 320,
 			"pxHei": 192,
@@ -949,7 +1024,7 @@
 			"__cHei": 1,
 			"identifier": "RAT",
 			"uid": 24,
-			"relPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Characters/Enemies and NPC/Dog/Spritesheets/dog-idle.png",
+			"relPath": "Characters/dog/Spritesheets/dog-idle.png",
 			"embedAtlas": null,
 			"pxWid": 198,
 			"pxHei": 26,
@@ -1015,7 +1090,7 @@
 			"__bgColor": "#696A79",
 			"bgColor": null,
 			"useAutoIdentifier": true,
-			"bgRelPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Environments/Forest/Forest Pack/PNG/environment/Background Layers/background.png",
+			"bgRelPath": "environment/Forest/Background Layers/background.png",
 			"bgPos": "Cover",
 			"bgPivotX": 0.5,
 			"bgPivotY": 0.5,
@@ -1251,26 +1326,29 @@
 							"height": 16,
 							"defUid": 14,
 							"px": [40,144],
-							"fieldInstances": []
+							"fieldInstances": [
+								{ "__identifier": "animation_timer", "__type": "Float", "__value": 0.3, "__tile": null, "defUid": 58, "realEditorValues": [] },
+								{ "__identifier": "animation_indices", "__type": "Array<Int>", "__value": [0,3], "__tile": null, "defUid": 59, "realEditorValues": [ { "id": "V_Int", "params": [0] }, { "id": "V_Int", "params": [3] } ] }
+							]
 						},
 						{
 							"__identifier": "Goal",
 							"__grid": [34,12],
-							"__pivot": [0.5,0.5],
+							"__pivot": [0.5,1],
 							"__tags": [],
 							"__tile": { "tilesetUid": 36, "x": 0, "y": 0, "w": 16, "h": 16 },
 							"__smartColor": "#EAD4AA",
-							"iid": "ee9001c0-9b00-11ef-a60d-5b17cba2b0bd",
+							"iid": "265d9ca0-9b00-11ef-8557-9dc0be7be55f",
 							"width": 16,
 							"height": 24,
 							"defUid": 15,
-							"px": [552,200],
+							"px": [552,208],
 							"fieldInstances": []
 						}
 					]
 				},
 				{
-					"__identifier": "Walls",
+					"__identifier": "Collisions",
 					"__type": "IntGrid",
 					"__cWid": 35,
 					"__cHei": 20,
@@ -1279,7 +1357,7 @@
 					"__pxTotalOffsetX": 0,
 					"__pxTotalOffsetY": 0,
 					"__tilesetDefUid": 2,
-					"__tilesetRelPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Environments/Forest/Forest Pack/PNG/environment/tileset.png",
+					"__tilesetRelPath": "environment/Forest/tileset.png",
 					"iid": "6a159530-73f0-11ef-b8f3-478a60fd3c71",
 					"levelId": 0,
 					"layerDefUid": 4,
@@ -1912,7 +1990,7 @@
 						0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,
 						0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,
 						0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-						0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+						0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 						1
 					],
 					"autoLayerTiles": [
@@ -1937,6 +2015,20 @@
 						{ "px": [0,144], "src": [0,16], "f": 0, "t": 2, "d": [31,144], "a": 1 },
 						{ "px": [240,144], "src": [0,0], "f": 0, "t": 0, "d": [31,159], "a": 1 },
 						{ "px": [0,160], "src": [0,0], "f": 0, "t": 0, "d": [31,160], "a": 1 },
+						{ "px": [16,160], "src": [0,16], "f": 0, "t": 2, "d": [31,161], "a": 1 },
+						{ "px": [32,160], "src": [0,0], "f": 0, "t": 0, "d": [31,162], "a": 1 },
+						{ "px": [48,160], "src": [0,16], "f": 0, "t": 2, "d": [31,163], "a": 1 },
+						{ "px": [64,160], "src": [0,16], "f": 0, "t": 2, "d": [31,164], "a": 1 },
+						{ "px": [80,160], "src": [0,0], "f": 0, "t": 0, "d": [31,165], "a": 1 },
+						{ "px": [96,160], "src": [0,16], "f": 0, "t": 2, "d": [31,166], "a": 1 },
+						{ "px": [112,160], "src": [0,16], "f": 0, "t": 2, "d": [31,167], "a": 1 },
+						{ "px": [128,160], "src": [0,16], "f": 0, "t": 2, "d": [31,168], "a": 1 },
+						{ "px": [144,160], "src": [0,0], "f": 0, "t": 0, "d": [31,169], "a": 1 },
+						{ "px": [160,160], "src": [0,16], "f": 0, "t": 2, "d": [31,170], "a": 1 },
+						{ "px": [176,160], "src": [0,0], "f": 0, "t": 0, "d": [31,171], "a": 1 },
+						{ "px": [192,160], "src": [0,16], "f": 0, "t": 2, "d": [31,172], "a": 1 },
+						{ "px": [208,160], "src": [0,0], "f": 0, "t": 0, "d": [31,173], "a": 1 },
+						{ "px": [224,160], "src": [0,16], "f": 0, "t": 2, "d": [31,174], "a": 1 },
 						{ "px": [240,160], "src": [0,16], "f": 0, "t": 2, "d": [31,175], "a": 1 }
 					],
 					"seed": 9045717,
@@ -1992,22 +2084,7 @@
 					"seed": 9284298,
 					"overrideTilesetUid": null,
 					"gridTiles": [],
-					"entityInstances": [
-						{
-							"__identifier": "Player",
-							"__grid": [1,9],
-							"__pivot": [0.5,1],
-							"__tags": [],
-							"__tile": { "tilesetUid": 27, "x": 0, "y": 0, "w": 32, "h": 32 },
-							"__smartColor": "#D77643",
-							"iid": "8b5bc310-73f0-11ef-83af-53f2d18f6592",
-							"width": 16,
-							"height": 16,
-							"defUid": 14,
-							"px": [16,160],
-							"fieldInstances": []
-						}
-					]
+					"entityInstances": []
 				},
 				{
 					"__identifier": "Player",
@@ -2033,10 +2110,27 @@
 					"overrideTilesetUid": null,
 					"gridTiles": [],
 					"entityInstances": [
+						{
+							"__identifier": "Player",
+							"__grid": [1,9],
+							"__pivot": [0.5,1],
+							"__tags": [],
+							"__tile": { "tilesetUid": 27, "x": 0, "y": 0, "w": 32, "h": 32 },
+							"__smartColor": "#D77643",
+							"iid": "8b5bc310-73f0-11ef-83af-53f2d18f6592",
+							"width": 16,
+							"height": 16,
+							"defUid": 14,
+							"px": [24,160],
+							"fieldInstances": [
+								{ "__identifier": "animation_timer", "__type": "Float", "__value": 0.3, "__tile": null, "defUid": 58, "realEditorValues": [] },
+								{ "__identifier": "animation_indices", "__type": "Array<Int>", "__value": [0,3], "__tile": null, "defUid": 59, "realEditorValues": [ { "id": "V_Int", "params": [0] }, { "id": "V_Int", "params": [3] } ] }
+							]
+						},
 						{
 							"__identifier": "Goal",
-							"__grid": [7,1],
-							"__pivot": [0.5,0.5],
+							"__grid": [13,6],
+							"__pivot": [0.5,1],
 							"__tags": [],
 							"__tile": { "tilesetUid": 36, "x": 0, "y": 0, "w": 16, "h": 16 },
 							"__smartColor": "#EAD4AA",
@@ -2044,13 +2138,13 @@
 							"width": 16,
 							"height": 24,
 							"defUid": 15,
-							"px": [120,24],
+							"px": [216,112],
 							"fieldInstances": []
 						}
 					]
 				},
 				{
-					"__identifier": "Walls",
+					"__identifier": "Collisions",
 					"__type": "IntGrid",
 					"__cWid": 16,
 					"__cHei": 11,
@@ -2059,7 +2153,7 @@
 					"__pxTotalOffsetX": 0,
 					"__pxTotalOffsetY": 0,
 					"__tilesetDefUid": 2,
-					"__tilesetRelPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Environments/Forest/Forest Pack/PNG/environment/tileset.png",
+					"__tilesetRelPath": "environment/Forest/tileset.png",
 					"iid": "e4b98414-73f0-11ef-83af-ed82ee437def",
 					"levelId": 43,
 					"layerDefUid": 4,
@@ -2903,12 +2997,15 @@
 							"height": 16,
 							"defUid": 14,
 							"px": [64,176],
-							"fieldInstances": []
+							"fieldInstances": [
+								{ "__identifier": "animation_timer", "__type": "Float", "__value": 0.3, "__tile": null, "defUid": 58, "realEditorValues": [] },
+								{ "__identifier": "animation_indices", "__type": "Array<Int>", "__value": [0,3], "__tile": null, "defUid": 59, "realEditorValues": [ null, { "id": "V_Int", "params": [3] } ] }
+							]
 						},
 						{
 							"__identifier": "Goal",
 							"__grid": [1,5],
-							"__pivot": [0.5,0.5],
+							"__pivot": [0.5,1],
 							"__tags": [],
 							"__tile": { "tilesetUid": 36, "x": 0, "y": 0, "w": 16, "h": 16 },
 							"__smartColor": "#EAD4AA",
@@ -2922,7 +3019,7 @@
 					]
 				},
 				{
-					"__identifier": "Walls",
+					"__identifier": "Collisions",
 					"__type": "IntGrid",
 					"__cWid": 85,
 					"__cHei": 14,
@@ -2931,7 +3028,7 @@
 					"__pxTotalOffsetX": 0,
 					"__pxTotalOffsetY": 0,
 					"__tilesetDefUid": 2,
-					"__tilesetRelPath": "Sunny Land Collection Files/Sunny Land Collection Files/Assets/Environments/Forest/Forest Pack/PNG/environment/tileset.png",
+					"__tilesetRelPath": "environment/Forest/tileset.png",
 					"iid": "60e1e922-73f0-11ef-b56f-0584aa406eea",
 					"levelId": 22,
 					"layerDefUid": 4,
diff --git a/src/animations.rs b/src/animations.rs
new file mode 100644
index 0000000..74b34ca
--- /dev/null
+++ b/src/animations.rs
@@ -0,0 +1,74 @@
+use bevy::ecs::prelude::{Component, Query, Res};
+use bevy::prelude::*;
+use bevy::prelude::{Time, Timer};
+use bevy::sprite::TextureAtlas;
+use bevy_ecs_ldtk::ldtk::ldtk_fields::LdtkFields;
+use bevy_ecs_ldtk::EntityInstance;
+
+use crate::player::Player;
+
+#[derive(Component, Default)]
+pub struct AnimationIndices {
+    first: i32,
+    last: i32,
+}
+
+#[derive(Component, Deref, DerefMut, Default)]
+pub struct AnimationTimer(Timer);
+
+impl AnimationTimer {
+    fn default() -> Self {
+        AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating))
+    }
+}
+impl From<&EntityInstance> for AnimationTimer {
+    fn from(entity_instance: &EntityInstance) -> Self {
+        AnimationTimer(Timer::from_seconds(
+            entity_instance
+                .get_float_field("animation_timer")
+                .expect("items field should be correctly typed")
+                .clone(),
+            TimerMode::Repeating,
+        ))
+    }
+}
+
+impl From<&EntityInstance> for AnimationIndices {
+    fn from(entity_instance: &EntityInstance) -> Self {
+        let indices: Vec<i32> = entity_instance
+            .iter_ints_field("animation_indices")
+            .expect("numbers field should be correctly typed")
+            .cloned()
+            .collect();
+
+        let first = indices.get(0).expect("fuck");
+        let last = indices.get(1).expect("fuck");
+        AnimationIndices {
+            first: *first,
+            last: *last,
+        }
+    }
+}
+fn animate_player(
+    time: Res<Time>,
+    mut query: Query<(&AnimationIndices, &mut AnimationTimer, &mut TextureAtlas), With<Player>>,
+) {
+    for (indices, mut timer, mut atlas) in &mut query {
+        timer.tick(time.delta());
+        if timer.just_finished() {
+            atlas.index = if atlas.index == indices.last as usize {
+                indices.first as usize
+            } else {
+                atlas.index + 1
+            };
+        }
+    }
+}
+
+pub struct ShockingAnimationPlugin;
+
+impl Plugin for ShockingAnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, animate_player);
+    }
+}
diff --git a/src/camera.rs b/src/camera.rs
index 7e778e4..05b2e80 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,9 +1,7 @@
 use bevy::prelude::*;
-use bevy_ecs_ldtk::prelude::*;
 
 use crate::player::Player;
 
-
 pub struct CameraPlugin;
 
 impl Plugin for CameraPlugin {
diff --git a/src/colliders.rs b/src/colliders.rs
new file mode 100644
index 0000000..e426fb8
--- /dev/null
+++ b/src/colliders.rs
@@ -0,0 +1,76 @@
+use bevy::prelude::*;
+use bevy_ecs_ldtk::prelude::*;
+
+use bevy_rapier2d::prelude::*;
+
+#[derive(Clone, Default, Bundle, LdtkIntCell)]
+pub struct ColliderBundle {
+    pub collider: Collider,
+    pub rigid_body: RigidBody,
+    pub velocity: Velocity,
+    pub rotation_constraints: LockedAxes,
+    pub gravity_scale: GravityScale,
+    pub friction: Friction,
+    pub density: ColliderMassProperties,
+}
+
+impl From<&EntityInstance> for ColliderBundle {
+    fn from(entity_instance: &EntityInstance) -> ColliderBundle {
+        let rotation_constraints = LockedAxes::ROTATION_LOCKED;
+
+        match entity_instance.identifier.as_ref() {
+            "Player" => ColliderBundle {
+                collider: Collider::cuboid(6., 14.),
+                rigid_body: RigidBody::Dynamic,
+                friction: Friction {
+                    coefficient: 0.0,
+                    combine_rule: CoefficientCombineRule::Min,
+                },
+                rotation_constraints,
+                ..Default::default()
+            },
+            "Mob" => ColliderBundle {
+                collider: Collider::cuboid(5., 5.),
+                rigid_body: RigidBody::KinematicVelocityBased,
+                rotation_constraints,
+                ..Default::default()
+            },
+            "Chest" => ColliderBundle {
+                collider: Collider::cuboid(8., 8.),
+                rigid_body: RigidBody::Dynamic,
+                rotation_constraints,
+                gravity_scale: GravityScale(1.0),
+                friction: Friction::new(0.5),
+                density: ColliderMassProperties::Density(15.0),
+                ..Default::default()
+            },
+            _ => ColliderBundle::default(),
+        }
+    }
+}
+
+#[derive(Clone, Default, Bundle, LdtkIntCell)]
+pub struct SensorBundle {
+    pub collider: Collider,
+    pub sensor: Sensor,
+    pub active_events: ActiveEvents,
+    pub rotation_constraints: LockedAxes,
+}
+
+impl From<IntGridCell> for SensorBundle {
+    fn from(int_grid_cell: IntGridCell) -> SensorBundle {
+        let rotation_constraints = LockedAxes::ROTATION_LOCKED;
+
+        // ladder
+        if int_grid_cell.value == 2 {
+            SensorBundle {
+                collider: Collider::cuboid(8., 8.),
+                sensor: Sensor,
+                rotation_constraints,
+                active_events: ActiveEvents::COLLISION_EVENTS,
+            }
+        } else {
+            SensorBundle::default()
+        }
+    }
+}
diff --git a/src/goal.rs b/src/goal.rs
index fc4d7ef..dab79ec 100644
--- a/src/goal.rs
+++ b/src/goal.rs
@@ -17,13 +17,16 @@ pub struct GoalBundle {
 
 pub fn check_goal(
     level_selection: ResMut<LevelSelection>,
-    players: Query<&GridCoords, (With<Player>, Changed<GridCoords>)>,
-    goals: Query<&GridCoords, With<Goal>>,
+    players: Query<&Transform, (With<Player>, Changed<Transform>)>,
+    goals: Query<&Transform, With<Goal>>,
 ) {
     if players
         .iter()
         .zip(goals.iter())
-        .any(|(player_grid_coords, goal_grid_coords)| player_grid_coords == goal_grid_coords)
+        .any(|(player_grid_coords, goal_grid_coords)| {
+            ((player_grid_coords.translation.x - goal_grid_coords.translation.x).abs() <= 3.)
+                && ((player_grid_coords.translation.y - goal_grid_coords.translation.y).abs() <= 3.)
+        })
     {
         let indices = match level_selection.into_inner() {
             LevelSelection::Indices(indices) => indices,
@@ -32,4 +35,4 @@ pub fn check_goal(
 
         indices.level += 1;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ground_detection.rs b/src/ground_detection.rs
new file mode 100644
index 0000000..391f60f
--- /dev/null
+++ b/src/ground_detection.rs
@@ -0,0 +1,103 @@
+use std::collections::HashSet;
+
+use bevy::prelude::*;
+
+use bevy_rapier2d::prelude::*;
+
+#[derive(Component)]
+pub struct GroundSensor {
+    pub ground_detection_entity: Entity,
+    pub intersecting_ground_entities: HashSet<Entity>,
+}
+
+#[derive(Clone, Default, Component)]
+pub struct GroundDetection {
+    pub on_ground: bool,
+}
+
+pub fn spawn_ground_sensor(
+    mut commands: Commands,
+    detect_ground_for: Query<(Entity, &Collider), Added<GroundDetection>>,
+) {
+    for (entity, shape) in &detect_ground_for {
+        if let Some(cuboid) = shape.as_cuboid() {
+            let Vec2 {
+                x: half_extents_x,
+                y: half_extents_y,
+            } = cuboid.half_extents();
+
+            let detector_shape = Collider::cuboid(half_extents_x / 2.0, 2.);
+
+            let sensor_translation = Vec3::new(0., -half_extents_y, 0.);
+
+            commands.entity(entity).with_children(|builder| {
+                builder
+                    .spawn_empty()
+                    .insert(ActiveEvents::COLLISION_EVENTS)
+                    .insert(detector_shape)
+                    .insert(Sensor)
+                    .insert(Transform::from_translation(sensor_translation))
+                    .insert(GlobalTransform::default())
+                    .insert(GroundSensor {
+                        ground_detection_entity: entity,
+                        intersecting_ground_entities: HashSet::new(),
+                    });
+            });
+        }
+    }
+}
+
+pub fn ground_detection(
+    mut ground_sensors: Query<&mut GroundSensor>,
+    mut collisions: EventReader<CollisionEvent>,
+    collidables: Query<Entity, (With<Collider>, Without<Sensor>)>,
+) {
+    for collision_event in collisions.read() {
+        match collision_event {
+            CollisionEvent::Started(e1, e2, _) => {
+                if collidables.contains(*e1) {
+                    if let Ok(mut sensor) = ground_sensors.get_mut(*e2) {
+                        sensor.intersecting_ground_entities.insert(*e1);
+                    }
+                } else if collidables.contains(*e2) {
+                    if let Ok(mut sensor) = ground_sensors.get_mut(*e1) {
+                        sensor.intersecting_ground_entities.insert(*e2);
+                    }
+                }
+            }
+            CollisionEvent::Stopped(e1, e2, _) => {
+                if collidables.contains(*e1) {
+                    if let Ok(mut sensor) = ground_sensors.get_mut(*e2) {
+                        sensor.intersecting_ground_entities.remove(e1);
+                    }
+                } else if collidables.contains(*e2) {
+                    if let Ok(mut sensor) = ground_sensors.get_mut(*e1) {
+                        sensor.intersecting_ground_entities.remove(e2);
+                    }
+                }
+            }
+        }
+    }
+}
+
+pub fn update_on_ground(
+    mut ground_detectors: Query<&mut GroundDetection>,
+    ground_sensors: Query<&GroundSensor, Changed<GroundSensor>>,
+) {
+    for sensor in &ground_sensors {
+        if let Ok(mut ground_detection) = ground_detectors.get_mut(sensor.ground_detection_entity) {
+            ground_detection.on_ground = !sensor.intersecting_ground_entities.is_empty();
+        }
+    }
+}
+
+/// Handles platformer-specific physics operations, specifically ground detection.
+pub struct GroundDetectionPlugin;
+
+impl Plugin for GroundDetectionPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, spawn_ground_sensor)
+            .add_systems(Update, ground_detection)
+            .add_systems(Update, update_on_ground);
+    }
+}
diff --git a/src/level_structure.rs b/src/level_structure.rs
index 9a4fba2..e1bd03b 100644
--- a/src/level_structure.rs
+++ b/src/level_structure.rs
@@ -1,5 +1,12 @@
-use bevy::prelude::*;
+use bevy::{
+    prelude::*,
+    utils::{HashMap, HashSet},
+};
 use bevy_ecs_ldtk::prelude::*;
+use bevy_rapier2d::{
+    dynamics::RigidBody,
+    geometry::{Collider, Friction},
+};
 
 #[derive(Default, Component)]
 pub struct Wall;
@@ -8,3 +15,148 @@ pub struct Wall;
 pub struct WallBundle {
     wall: Wall,
 }
+pub fn spawn_wall_collision(
+    mut commands: Commands,
+    wall_query: Query<(&GridCoords, &Parent), Added<Wall>>,
+    parent_query: Query<&Parent, Without<Wall>>,
+    level_query: Query<(Entity, &LevelIid)>,
+    ldtk_projects: Query<&Handle<LdtkProject>>,
+    ldtk_project_assets: Res<Assets<LdtkProject>>,
+) {
+    /// Represents a wide wall that is 1 tile tall
+    /// Used to spawn wall collisions
+    #[derive(Clone, Eq, PartialEq, Debug, Default, Hash)]
+    struct Plate {
+        left: i32,
+        right: i32,
+    }
+
+    /// A simple rectangle type representing a wall of any size
+    struct Rect {
+        left: i32,
+        right: i32,
+        top: i32,
+        bottom: i32,
+    }
+    let mut level_to_wall_locations: HashMap<Entity, HashSet<GridCoords>> = HashMap::new();
+    wall_query.iter().for_each(|(&grid_coords, parent)| {
+        if let Ok(grandparent) = parent_query.get(parent.get()) {
+            level_to_wall_locations
+                .entry(grandparent.get())
+                .or_default()
+                .insert(grid_coords);
+        }
+    });
+
+    if !wall_query.is_empty() {
+        level_query.iter().for_each(|(level_entity, level_iid)| {
+            if let Some(level_walls) = level_to_wall_locations.get(&level_entity) {
+                let ldtk_project = ldtk_project_assets
+                    .get(ldtk_projects.single())
+                    .expect("Project has to be loaded at this point");
+
+                let level = ldtk_project
+                    .as_standalone()
+                    .get_loaded_level_by_iid(&level_iid.to_string())
+                    .expect("Spawned level should exist in LDtk project");
+
+                let LayerInstance {
+                    c_wid: width,
+                    c_hei: height,
+                    grid_size,
+                    ..
+                } = level.layer_instances()[0];
+
+                let mut plate_stack: Vec<Vec<Plate>> = Vec::new();
+
+                for y in 0..height {
+                    let mut row_plates: Vec<Plate> = Vec::new();
+                    let mut plate_start = None;
+
+                    for x in 0..width + 1 {
+                        match (plate_start, level_walls.contains(&GridCoords { x, y })) {
+                            (Some(s), false) => {
+                                row_plates.push(Plate {
+                                    left: s,
+                                    right: x - 1,
+                                });
+                                plate_start = None;
+                            }
+                            (None, true) => plate_start = Some(x),
+                            _ => (),
+                        }
+                    }
+                    plate_stack.push(row_plates);
+                }
+                // combine "plates" into rectangles across multiple rows
+                let mut rect_builder: HashMap<Plate, Rect> = HashMap::new();
+                let mut prev_row: Vec<Plate> = Vec::new();
+                let mut wall_rects: Vec<Rect> = Vec::new();
+
+                // an extra empty row so the algorithm "finishes" the rects that touch the top edge
+                plate_stack.push(Vec::new());
+
+                for (y, current_row) in plate_stack.into_iter().enumerate() {
+                    for prev_plate in &prev_row {
+                        if !current_row.contains(prev_plate) {
+                            //remove rect so the same plate starts a new rectangle
+                            if let Some(rect) = rect_builder.remove(prev_plate) {
+                                wall_rects.push(rect);
+                            }
+                        }
+                    }
+                    for plate in &current_row {
+                        rect_builder
+                            .entry(plate.clone())
+                            .and_modify(|e| e.top += 1)
+                            .or_insert(Rect {
+                                bottom: y as i32,
+                                top: y as i32,
+                                left: plate.left,
+                                right: plate.right,
+                            });
+                    }
+                    prev_row = current_row;
+                }
+                commands.entity(level_entity).with_children(|level| {
+                    // Spawn colliders for every rectangle..
+                    // Making the collider a child of the level serves two purposes:
+                    // 1. Adjusts the transforms to be relative to the level for free
+                    // 2. the colliders will be despawned automatically when levels unload
+                    for wall_rect in wall_rects {
+                        level
+                            .spawn_empty()
+                            .insert(Collider::cuboid(
+                                (wall_rect.right as f32 - wall_rect.left as f32 + 1.)
+                                    * grid_size as f32
+                                    / 2.,
+                                (wall_rect.top as f32 - wall_rect.bottom as f32 + 1.)
+                                    * grid_size as f32
+                                    / 2.,
+                            ))
+                            .insert(RigidBody::Fixed)
+                            .insert(Friction::new(1.0))
+                            .insert(Transform::from_xyz(
+                                (wall_rect.left + wall_rect.right + 1) as f32 * grid_size as f32
+                                    / 2.,
+                                (wall_rect.bottom + wall_rect.top + 1) as f32 * grid_size as f32
+                                    / 2.,
+                                0.,
+                                //this averages xy so it in center yes )
+                            ))
+                            .insert(GlobalTransform::default());
+                    }
+                });
+            }
+        });
+    }
+}
+pub struct WallPlugin;
+
+impl Plugin for WallPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, spawn_wall_collision)
+            .register_ldtk_int_cell::<WallBundle>(1) //dirt
+            .register_ldtk_int_cell::<WallBundle>(3); //stone
+    }
+}
diff --git a/src/logging.rs b/src/logging.rs
index 7274460..da29444 100644
--- a/src/logging.rs
+++ b/src/logging.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::player::Player;
+use crate::{goal::Goal, player::Player};
 
 // Yes I used chatgpt for this
 // sue me, it's a mundane task :P
@@ -8,6 +8,7 @@ use crate::player::Player;
 pub fn log_positions(
     camera_query: Query<&Transform, With<Camera2d>>,
     player_query: Query<&Transform, With<Player>>,
+    goals: Query<&Transform, With<Goal>>,
 ) {
     // Log camera position
     if let Ok(camera_transform) = camera_query.get_single() {
@@ -22,4 +23,9 @@ pub fn log_positions(
     } else {
         info!("Player not found or multiple players detected.");
     }
+    if let Ok(goal_transform) = goals.get_single() {
+        info!("Goal Position: {:?}", goal_transform.translation);
+    } else {
+        info!("Goal not found or multiple players detected.");
+    }
 }
diff --git a/src/main.rs b/src/main.rs
index cb06de1..a25a4de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,46 +1,65 @@
+use animations::ShockingAnimationPlugin;
 use bevy::prelude::*;
 use bevy_ecs_ldtk::prelude::*;
+use bevy_rapier2d::plugin::{NoUserData, RapierConfiguration, RapierPhysicsPlugin, TimestepMode};
 use camera::CameraPlugin;
+use goal::{check_goal, GoalBundle};
+use ground_detection::GroundDetectionPlugin;
+use level_structure::{WallBundle, WallPlugin};
 use logging::log_positions;
 use player::PlayerPlugin;
-use goal::{GoalBundle, check_goal};
-use level_structure::WallBundle;
 
+mod animations;
 mod camera;
+mod colliders;
+mod goal;
+mod ground_detection;
+mod level_structure;
 mod logging;
 mod player;
-mod goal;
-mod level_structure;
 
 pub const GRID_SIZE: i32 = 16;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugins(LdtkPlugin)
+        .add_plugins((
+            LdtkPlugin,
+            RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0),
+        ))
+        .insert_resource(RapierConfiguration {
+            gravity: Vec2::new(0.0, -2000.0),
+            physics_pipeline_active: true,
+            query_pipeline_active: true,
+            timestep_mode: TimestepMode::Variable {
+                max_dt: 1.0 / 60.0,
+                time_scale: 1.0,
+                substeps: 1,
+            },
+            scaled_shape_subdivision: 10,
+            force_update_from_transform_changes: false,
+        })
         .add_plugins(PlayerPlugin)
+        .add_plugins(WallPlugin)
+        .add_plugins(GroundDetectionPlugin)
         .insert_resource(LevelSelection::index(0))
         .register_ldtk_entity::<GoalBundle>("Goal")
         .register_ldtk_int_cell::<WallBundle>(1)
         .add_systems(Startup, setup)
-        .add_systems(Update, camera::camera_fit_inside_current_level)
         .add_plugins(CameraPlugin)
+        .add_plugins(ShockingAnimationPlugin)
         .add_systems(Update, (translate_grid_coords_entities, check_goal))
-        .add_systems(Update, log_positions)
+        // .add_systems(Update, log_positions)
         .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn(LdtkWorldBundle {
         ldtk_handle: asset_server.load("shocked-miguel.ldtk"),
-        level_set: LEVEL_SET,
-        // transform: Transform::from_xyz(-256., -144., 0.),
         ..Default::default()
     });
 }
 
-
-
 fn translate_grid_coords_entities(
     mut grid_coords_entities: Query<(&mut Transform, &GridCoords), Changed<GridCoords>>,
 ) {
@@ -50,8 +69,3 @@ fn translate_grid_coords_entities(
                 .extend(transform.translation.z);
     }
 }
-
-#[derive(Default, Component)]
-struct Wall;
-
-
diff --git a/src/player.rs b/src/player.rs
index 967c8a7..78a22be 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -1,10 +1,33 @@
-use bevy::{prelude::*, utils::HashSet};
+use bevy::prelude::*;
 use bevy_ecs_ldtk::prelude::*;
+use bevy_rapier2d::dynamics::Velocity;
 
-use crate::level_structure::Wall;
+use crate::{
+    animations::{AnimationIndices, AnimationTimer},
+    colliders::ColliderBundle,
+    ground_detection::GroundDetection,
+};
+
+pub struct PlayerPlugin;
+
+impl Plugin for PlayerPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, player_movement)
+            .register_ldtk_entity::<PlayerBundle>("Player");
+    }
+}
 
 #[derive(Default, Component)]
-pub(crate) struct Player;
+enum Facing {
+    Left,
+    #[default]
+    Right,
+}
+
+#[derive(Default, Component, LdtkEntity)]
+pub(crate) struct Player {
+    direction: Facing,
+}
 
 #[derive(Default, Bundle, LdtkEntity)]
 struct PlayerBundle {
@@ -13,85 +36,48 @@ struct PlayerBundle {
     sprite_bundle: LdtkSpriteSheetBundle,
     #[grid_coords]
     grid_coords: GridCoords,
+    pub ground_detection: GroundDetection,
+    #[from_entity_instance]
+    pub collider_bundle: ColliderBundle,
+    #[from_entity_instance]
+    animation_timer: AnimationTimer,
+    #[from_entity_instance]
+    animation_indices: AnimationIndices,
 }
 
-#[derive(Default, Resource)]
-struct LevelWalls {
-    wall_locations: HashSet<GridCoords>,
-    level_width: i32,
-    level_height: i32,
-}
-impl LevelWalls {
-    fn in_wall(&self, grid_coords: &GridCoords) -> bool {
-        grid_coords.x < 0
-            || grid_coords.y < 0
-            || grid_coords.x >= self.level_width
-            || grid_coords.y >= self.level_height
-            || self.wall_locations.contains(grid_coords)
-    }
-}
-
-fn move_player_from_input(
-    mut players: Query<&mut GridCoords, With<Player>>,
+fn player_movement(
+    mut query: Query<(&mut Velocity, &GroundDetection, &mut Player, &mut Sprite), With<Player>>,
     input: Res<ButtonInput<KeyCode>>,
-    level_walls: Res<LevelWalls>,
 ) {
-    let movement_direction =
-    if input.just_pressed(KeyCode::KeyW) || input.just_pressed(KeyCode::Space) {
-        GridCoords::new(0, 1)
-    } else if input.just_pressed(KeyCode::KeyA) {
-        GridCoords::new(-1, 0)
-    } else if input.just_pressed(KeyCode::KeyS) {
-        GridCoords::new(0, -1)
-    } else if input.just_pressed(KeyCode::KeyD) {
-        GridCoords::new(1, 0)
-    } else {
-        return;
-    };
+    for (mut velocity, ground_detection, mut player, mut p_sprite) in &mut query {
+        let right = if input.pressed(KeyCode::KeyD) {
+            player.direction = Facing::Right;
+            1.
+        } else {
+            0.
+        };
+        let left = if input.pressed(KeyCode::KeyA) {
+            player.direction = Facing::Left;
+            1.
+        } else {
+            0.
+        };
 
-    for mut player_grid_coords in players.iter_mut() {
-        let destination = *player_grid_coords + movement_direction;
-        if !level_walls.in_wall(&destination) {
-            *player_grid_coords = destination;
-        }
-    }
-}
-
-pub struct PlayerPlugin;
-
-impl Plugin for PlayerPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(Update, (move_player_from_input, cache_wall_locations))
-            .register_ldtk_entity::<PlayerBundle>("Player")
-            .init_resource::<LevelWalls>();
-    }
-}
-
-fn cache_wall_locations(
-    mut level_walls: ResMut<LevelWalls>,
-    mut level_events: EventReader<LevelEvent>,
-    walls: Query<&GridCoords, With<Wall>>,
-    ldtk_project_entities: Query<&Handle<LdtkProject>>,
-    ldtk_project_assets: Res<Assets<LdtkProject>>,
-) {
-    for level_event in level_events.read() {
-        if let LevelEvent::Spawned(level_iid) = level_event {
-            let ldtk_project = ldtk_project_assets
-                .get(ldtk_project_entities.single())
-                .expect("LdtkProject should be loaded when level is spawned");
-            let level = ldtk_project
-                .get_raw_level_by_iid(level_iid.get())
-                .expect("spawned level should exist in project");
-
-            let wall_locations = walls.iter().copied().collect();
-
-            let new_level_walls = LevelWalls {
-                wall_locations,
-                level_width: level.px_wid / crate::GRID_SIZE,
-                level_height: level.px_hei / crate::GRID_SIZE,
-            };
-
-            *level_walls = new_level_walls;
+        match player.direction {
+            Facing::Right => {
+                p_sprite.flip_x = false;
+            }
+            Facing::Left => {
+                p_sprite.flip_x = true;
+            }
+        }
+
+        // gotta query for sprite to control how the player "appears" to look in either direction
+
+        velocity.linvel.x = (right - left) * 200.;
+
+        if input.just_pressed(KeyCode::Space) && ground_detection.on_ground {
+            velocity.linvel.y = 500.;
         }
     }
 }