WIP symmetrical content type - refactoring