move Content stuff to new class, building in support for tags