Reshuffled again, broke compile. Program structure looks healthier.