finished w/ entity v1, starting v2 next