Finished porting code from current development machine to new test machine.