Added AABB collision detection & response