Started copy/paste p6 calc revisions

Gonna be a lot to do to integrate it - probably best to do full rebuild
of final2