started refactoring to integrate contentr with HSAA