Some more migration
Made next button work