Running into issues with how the code is formed - branching to rework.