Changes to main.
Began Integration Testing and Corrections