Initial commit for v2
further work towards new layout style
Ready for the prime time!