Work in progress v3.