This seems to be ok so far, might be ok to ditch post kinds?