Further refactored Tabset Code into Coherent, non-static classes