Updated to prepare for 2.0

Set versions to 2.0 but didnt make changes yet to fix it..