Almost ready for testing.