Initial work on version 2