Reworked the content types. Needs more work