Major overhaul. Split content types and added templates.