split into version #s, work on v2