Interim commit ahead of the next release. Still WIP.