dev work on 2.0 and parts of 3.0 spec