Initial work on version 3.0