Add Captain flag
Extract editing from the line controller