Version 2 complete

All changes to version 2, live on 12 Abril