starting work on 2.0