move logic to correct start file