batch updates 

Source updated and refactored as well... all 46 tests passing.