More work on whitepaper