major refactor in securesite manager