Add ship class, divide express out