Further work on version 2
Ready for first launch of version 2