Content Logic to be reworked

Will add detail once I have some time to figure things out