refactored
content almost working
content working