Added up through 6.4.3 including a little refactoring to tie the modules together properly.