Version 2 is coming along nicely