Reorganized for requested class setup for each week 1-4