Major functionality done for v2, moving to version 3