Manually merged colin's latest. Now we both start fresh from here.