Add hold, support and convoy orders and first pass at to_s
fixed merge conflict