More updates. Almost ready to test.