Some work on the Shipyard, one thing to fix before this works properly.