FinishLine: Get start up sorted a little bit