almost there...just need some finesse on splitting out final pivot columns