Temp Working. Branching to Refactor