major overhaul of internal workings for v2.0