Refactor start/finish.  Fix bug for stage Track start line detection