starting from scratch in preperation for v2.0