rework client data tracking, restructure structure storage into separate
manager class.  remove some of the silly container code...