Big update, following first successful test.