Refactor init, band choice works