Some huge restructuring - great strides in the myClub department. fixing mangling later
more restructuring