Finished up transition branch until AI is ready for CShip