initial work on securecomm refactor