Content

More feature changes. Review and let me know.