A lot of work on version 2