Modifications/Additions

Modifed the way we handle content
Added content