Some new naval unit ideas

I would also like to have a raft that can transport units. This could be either starting unit along with the fishing ship instead of transport and later get upgraded to transport, or a separate unit that is available only for scenarios. And then, as you said, some crossover units like trade ship that can fight, crane ship that can build and repair other ships (oh please, and bridges too) and maybe a transport ship that can fight?