In my opinion the answer to both questions is yes. I also believe that football and basketball could use some consolidating of classes.