Minor refactor, made auto start optional