Converted Waves to CanvasRoutine. (Serious chance this is borked)
Converted WarpSpeedMrSulu to CanvasRoutine