Worksheet v2

Enough of it is ready to merge it back in now.