Completed whitepaper TODOs