diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index 4b30a914..8317a413 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -30,4 +30,7 @@ public:
 	// BumpBouy::`scalar deleting destructor'
 };
 
+// GLOBAL: LEGO1 0x100d6788
+// BumpBouy::`vbtable'
+
 #endif // BUMPBOUY_H
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index ffdcbdcc..a7459604 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -47,15 +47,15 @@ public:
 
 	void FUN_1007c520();
 
-	inline Tgl::Renderer* GetRenderer() { return this->m_renderer; }
-	inline Lego3DManager* Get3DManager() { return this->m_3dManager; }
-	inline LegoROI* GetViewROI() { return this->m_viewROI; }
-	inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
-	inline MxBool GetRender3D() { return this->m_render3d; }
-	inline double GetElapsedSeconds() { return this->m_elapsedSeconds; }
+	inline Tgl::Renderer* GetRenderer() { return m_renderer; }
+	inline Lego3DManager* Get3DManager() { return m_3dManager; }
+	inline LegoROI* GetViewROI() { return m_viewROI; }
+	inline MxDirect3D* GetDirect3D() { return m_direct3d; }
+	inline MxBool GetRender3D() { return m_render3d; }
+	inline double GetElapsedSeconds() { return m_elapsedSeconds; }
 
-	inline void SetRender3D(MxBool p_render3d) { this->m_render3d = p_render3d; }
-	inline void SetUnk0x554(MxBool p_unk0x554) { this->m_unk0x554 = p_unk0x554; }
+	inline void SetRender3D(MxBool p_render3d) { m_render3d = p_render3d; }
+	inline void SetUnk0x554(MxBool p_unk0x554) { m_unk0x554 = p_unk0x554; }
 
 private:
 	MxResult CreateDirect3D();
diff --git a/LEGO1/lego/legoomni/src/actors/bike.cpp b/LEGO1/lego/legoomni/src/actors/bike.cpp
index 5fe2452e..0c5420be 100644
--- a/LEGO1/lego/legoomni/src/actors/bike.cpp
+++ b/LEGO1/lego/legoomni/src/actors/bike.cpp
@@ -57,7 +57,7 @@ MxLong Bike::HandleClick()
 		FUN_10015820(TRUE, 0);
 
 		((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_bike);
-		TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, TRUE);
+		TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
 
 		if (GameState()->GetActorId() != UserActor()->GetActorId()) {
 			((IslePathActor*) UserActor())->Exit();
diff --git a/LEGO1/lego/legoomni/src/actors/bumpbouy.cpp b/LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
index 22f9e696..52938ab3 100644
--- a/LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
+++ b/LEGO1/lego/legoomni/src/actors/bumpbouy.cpp
@@ -1,21 +1,56 @@
 #include "bumpbouy.h"
 
+#include "isle.h"
+#include "islepathactor.h"
+#include "legogamestate.h"
+#include "legovideomanager.h"
+#include "misc.h"
+#include "mxmisc.h"
+#include "mxnotificationmanager.h"
+#include "mxnotificationparam.h"
+#include "mxtransitionmanager.h"
+#include "scripts.h"
+
+#include <assert.h>
+
 DECOMP_SIZE_ASSERT(BumpBouy, 0x174)
 
-// STUB: LEGO1 0x10027220
+// FUNCTION: LEGO1 0x10027220
 BumpBouy::BumpBouy()
 {
+	NotificationManager()->Register(this);
 }
 
-// STUB: LEGO1 0x10027360
+// FUNCTION: LEGO1 0x10027360
 BumpBouy::~BumpBouy()
 {
-	// TODO
+	NotificationManager()->Unregister(this);
 }
 
-// STUB: LEGO1 0x10027400
+// FUNCTION: LEGO1 0x10027400
+// FUNCTION: BETA10 0x100262d9
 MxLong BumpBouy::Notify(MxParam& p_param)
 {
-	// TODO
-	return 0;
+	MxLong result = 0;
+	IslePathActor* user = (IslePathActor*) UserActor();
+	assert(user);
+
+	if (user->IsA("Jetski") && ((MxNotificationParam&) p_param).GetNotification() == c_notificationClick) {
+		VideoManager()->SetRender3D(FALSE);
+		user->SetWorldSpeed(0);
+		user->Exit();
+
+		Act1State* isleState = (Act1State*) GameState()->GetState("Act1State");
+		assert(isleState);
+		isleState->m_unk0x018 = 5;
+
+		Isle* isle = (Isle*) FindWorld(*g_isleScript, 0);
+		assert(isle);
+		isle->SetDestLocation(LegoGameState::e_jetrace);
+
+		TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
+		result = 1;
+	}
+
+	return result;
 }
diff --git a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
index f515dc03..30aff459 100644
--- a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
+++ b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
@@ -95,7 +95,7 @@ MxLong DuneBuggy::HandleClick()
 	FUN_10015820(TRUE, 0);
 
 	((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_dunecar);
-	TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, TRUE);
+	TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
 
 	if (GameState()->GetActorId() != UserActor()->GetActorId()) {
 		((IslePathActor*) UserActor())->Exit();
diff --git a/LEGO1/lego/legoomni/src/actors/motorcycle.cpp b/LEGO1/lego/legoomni/src/actors/motorcycle.cpp
index 31100203..94d3e0c5 100644
--- a/LEGO1/lego/legoomni/src/actors/motorcycle.cpp
+++ b/LEGO1/lego/legoomni/src/actors/motorcycle.cpp
@@ -91,7 +91,7 @@ MxLong Motocycle::HandleClick()
 	FUN_10015820(TRUE, 0);
 
 	((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_motocycle);
-	TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, TRUE);
+	TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
 
 	if (GameState()->GetActorId() != UserActor()->GetActorId()) {
 		((IslePathActor*) UserActor())->Exit();
diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp
index 3ca0bfc2..b2d00f94 100644
--- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp
@@ -82,7 +82,7 @@ MxLong SkateBoard::HandleClick()
 	FUN_10015820(TRUE, 0);
 
 	((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_skateboard);
-	TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, TRUE);
+	TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
 
 	if (GameState()->GetActorId() != UserActor()->GetActorId()) {
 		if (!UserActor()->IsA("SkateBoard")) {
diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
index f2f8068c..4287fe56 100644
--- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
@@ -53,7 +53,7 @@ MxLong HistoryBook::Notify(MxParam& p_param)
 		switch (((MxNotificationParam&) p_param).GetNotification()) {
 		case c_notificationButtonUp:
 			m_destLocation = LegoGameState::Area::e_infoscor;
-			TransitionManager()->StartTransition(MxTransitionManager::TransitionType::e_mosaic, 50, FALSE, FALSE);
+			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
 			break;
 		case c_notificationTransitioned:
 			GameState()->SwitchArea(m_destLocation);