Changed to use the ship graph, and now the data is represented properly