Working out the bugs
Modified to update income across all classes