Updates with some integration testing complete.