2.0

the pull for version 2.0, in progress