WIP: Revise everything to support desired stats on site

Waiting for feedback on output. See spec in email from Benji.