M_Boats: More progress!