Reworked variable names and continued work on integration tests.