redid classes in v2, still dirty but slowly getting better