muddled in the quagmire of another large refactor