Yup, combined, plus plans for other content to be more of a general content mod. Although it likely wouldn't include enemies, bosses, or structures, the stuff that general content mods usually have. This would include the Minstrel Class and a revamped throwing class, plus whatever content I...