Reorganized order of initialization and finished up the start endpoint