Realized I needed to rework some of the framework